diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:38:57 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:38:57 +0100 |
| commit | f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch) | |
| tree | a1f2ab30332a6383b0677bfcc2aec687b98851d6 /src/BatchImport.c | |
| parent | f8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff) | |
| parent | ede50c561ec9811704821a9ea0f04c3d6c20b5af (diff) | |
Merge branch 'release/0.26.4-1'0.26.4-1
Diffstat (limited to 'src/BatchImport.c')
| -rw-r--r-- | src/BatchImport.c | 10806 |
1 files changed, 5139 insertions, 5667 deletions
diff --git a/src/BatchImport.c b/src/BatchImport.c index 382a63c..89be92d 100644 --- a/src/BatchImport.c +++ b/src/BatchImport.c @@ -1,4 +1,4 @@ -/* BatchImport.c generated by valac 0.34.7, the Vala compiler +/* BatchImport.c generated by valac 0.36.6, the Vala compiler * generated from BatchImport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -672,6 +672,17 @@ typedef struct _EventSourceCollectionClass EventSourceCollectionClass; typedef struct _TagSourceCollection TagSourceCollection; typedef struct _TagSourceCollectionClass TagSourceCollectionClass; +enum { + BATCH_IMPORT_STARTING_SIGNAL, + BATCH_IMPORT_PREPARING_SIGNAL, + BATCH_IMPORT_PROGRESS_SIGNAL, + BATCH_IMPORT_IMPORTED_SIGNAL, + BATCH_IMPORT_FATAL_ERROR_SIGNAL, + BATCH_IMPORT_IMPORT_JOB_FAILED_SIGNAL, + BATCH_IMPORT_IMPORT_COMPLETE_SIGNAL, + BATCH_IMPORT_LAST_SIGNAL +}; +static guint batch_import_signals[BATCH_IMPORT_LAST_SIGNAL] = {0}; typedef struct _DuplicatedFilePrivate DuplicatedFilePrivate; #define _video_id_free0(var) ((var == NULL) ? NULL : (var = (video_id_free (var), NULL))) #define _photo_id_free0(var) ((var == NULL) ? NULL : (var = (photo_id_free (var), NULL))) @@ -823,8 +834,8 @@ struct _BatchImportJobClass { gchar* (*get_path) (BatchImportJob* self); DuplicatedFile* (*get_duplicated_file) (BatchImportJob* self); void (*set_associated) (BatchImportJob* self, BatchImportJob* associated); - gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile** file_or_dir); - gboolean (*prepare) (BatchImportJob* self, GFile** file_to_import, gboolean* copy_to_library, GError** error); + gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir); + gboolean (*prepare) (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error); gboolean (*complete) (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error); time_t (*get_exposure_time_override) (BatchImportJob* self); }; @@ -1100,7 +1111,9 @@ struct _BatchImportProcessPreparedFilesData { int _state_; GObject* _source_object_; GAsyncResult* _res_; - GSimpleAsyncResult* _async_result; + GTask* _async_result; + GAsyncReadyCallback _callback_; + gboolean _task_complete_; BatchImport* self; GeeList* list; GeeList* _prepared_file_list; @@ -1702,16 +1715,16 @@ DuplicatedFile* batch_import_job_get_duplicated_file (BatchImportJob* self); static DuplicatedFile* batch_import_job_real_get_duplicated_file (BatchImportJob* self); void batch_import_job_set_associated (BatchImportJob* self, BatchImportJob* associated); static void batch_import_job_real_set_associated (BatchImportJob* self, BatchImportJob* associated); -gboolean batch_import_job_determine_file_size (BatchImportJob* self, guint64* filesize, GFile** file_or_dir); -static gboolean batch_import_job_real_determine_file_size (BatchImportJob* self, guint64* filesize, GFile** file_or_dir); -gboolean batch_import_job_prepare (BatchImportJob* self, GFile** file_to_import, gboolean* copy_to_library, GError** error); -static gboolean batch_import_job_real_prepare (BatchImportJob* self, GFile** file_to_import, gboolean* copy_to_library, GError** error); +gboolean batch_import_job_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir); +static gboolean batch_import_job_real_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir); +gboolean batch_import_job_prepare (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error); +static gboolean batch_import_job_real_prepare (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error); gboolean batch_import_job_complete (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error); static gboolean batch_import_job_real_complete (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error); time_t batch_import_job_get_exposure_time_override (BatchImportJob* self); static time_t batch_import_job_real_get_exposure_time_override (BatchImportJob* self); BatchImportJob* batch_import_job_construct (GType object_type); -static void batch_import_job_finalize (BatchImportJob* obj); +static void batch_import_job_finalize (BatchImportJob * obj); GType file_import_job_get_type (void) G_GNUC_CONST; #define FILE_IMPORT_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_FILE_IMPORT_JOB, FileImportJobPrivate)) enum { @@ -1726,10 +1739,10 @@ gboolean query_is_directory (GFile* file); static gchar* file_import_job_real_get_basename (BatchImportJob* base); static gchar* file_import_job_real_get_path (BatchImportJob* base); static void file_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated); -static gboolean file_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile** file); -static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile** file_to_import, gboolean* copy, GError** error); +static gboolean file_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file); +static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy, GError** error); GFile* file_import_job_get_file (FileImportJob* self); -static void file_import_job_finalize (BatchImportJob* obj); +static void file_import_job_finalize (BatchImportJob * obj); GType import_id_get_type (void) G_GNUC_CONST; ImportID* import_id_dup (const ImportID* self); void import_id_free (ImportID* self); @@ -1749,7 +1762,7 @@ ViewCollection* view_collection_construct (GType object_type, const gchar* name) BatchImportRoll* batch_import_roll_new (void); BatchImportRoll* batch_import_roll_construct (GType object_type); void import_id_generate (ImportID* result); -static void batch_import_roll_finalize (BatchImportRoll* obj); +static void batch_import_roll_finalize (BatchImportRoll * obj); gpointer batch_import_result_ref (gpointer instance); void batch_import_result_unref (gpointer instance); GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -1764,7 +1777,7 @@ BatchImportResult* batch_import_result_new (BatchImportJob* job, GFile* file, co BatchImportResult* batch_import_result_construct (GType object_type, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, DuplicatedFile* duplicate_of, ImportResult _result_); BatchImportResult* batch_import_result_new_from_error (BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result); BatchImportResult* batch_import_result_construct_from_error (GType object_type, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result); -static void batch_import_result_finalize (BatchImportResult* obj); +static void batch_import_result_finalize (BatchImportResult * obj); gpointer import_manifest_ref (gpointer instance); void import_manifest_unref (gpointer instance); GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -1778,7 +1791,7 @@ enum { ImportManifest* import_manifest_new (GeeList* prefailed, GeeList* pre_already_imported); ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed, GeeList* pre_already_imported); void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_result); -static void import_manifest_finalize (ImportManifest* obj); +static void import_manifest_finalize (ImportManifest * obj); GType batch_import_get_type (void) G_GNUC_CONST; gpointer prepared_file_ref (gpointer instance); void prepared_file_unref (gpointer instance); @@ -1913,6 +1926,7 @@ GType prepared_file_cluster_get_type (void) G_GNUC_CONST; static void batch_import_process_prepared_files (BatchImport* self, GeeList* list, GAsyncReadyCallback _callback_, gpointer _user_data_); static void batch_import_process_prepared_files_finish (BatchImport* self, GAsyncResult* _res_); static void batch_import_process_prepared_files_data_free (gpointer _data); +static void batch_import_process_prepared_files_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data); static gboolean batch_import_process_prepared_files_co (BatchImportProcessPreparedFilesData* _data_); static gboolean _batch_import_process_prepared_files_co_gsource_func (gpointer self); GType library_photo_source_collection_state_get_type (void) G_GNUC_CONST; @@ -2004,8 +2018,8 @@ GType tombstone_get_type (void) G_GNUC_CONST; GType tombstone_source_collection_get_type (void) G_GNUC_CONST; Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, GFile* file); void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, Tombstone* tombstone); -ImportResult video_import_create (VideoImportParams* params, Video** video); -ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhoto** photo); +ImportResult video_import_create (VideoImportParams* params, Video* * video); +ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhoto* * photo); GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; gpointer thumbnails_ref (gpointer instance); void thumbnails_unref (gpointer instance); @@ -2071,12 +2085,13 @@ void media_source_collection_import_many (MediaSourceCollection* self, GeeCollec void event_generate_many_events (GeeCollection* sources, ViewCollection* events_so_far); void data_collection_thaw_notifications (DataCollection* self); void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistry* self); +guint64 media_source_get_master_filesize (MediaSource* self); static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); static void g_cclosure_user_marshal_VOID__ENUM_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); static void g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); static void g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void batch_import_finalize (GObject* obj); +static void batch_import_finalize (GObject * obj); #define DUPLICATED_FILE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DUPLICATED_FILE, DuplicatedFilePrivate)) enum { DUPLICATED_FILE_DUMMY_PROPERTY @@ -2088,7 +2103,7 @@ gboolean video_id_is_valid (VideoID *self); GFile* duplicated_file_get_file (DuplicatedFile* self); LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, PhotoID* photo_id); Video* video_source_collection_fetch (VideoSourceCollection* self, VideoID* video_id); -static void duplicated_file_finalize (GObject* obj); +static void duplicated_file_finalize (GObject * obj); enum { BACKGROUND_IMPORT_JOB_DUMMY_PROPERTY }; @@ -2106,7 +2121,7 @@ gboolean background_job_is_cancelled (BackgroundJob* self); void background_import_job_abort (BackgroundImportJob* self, ImportResult _result_); void background_import_job_report_failure (BackgroundImportJob* self, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, ImportResult _result_); void background_import_job_report_error (BackgroundImportJob* self, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result); -static void background_import_job_finalize (BackgroundJob* obj); +static void background_import_job_finalize (BackgroundJob * obj); enum { FILE_TO_PREPARE_DUMMY_PROPERTY }; @@ -2117,17 +2132,17 @@ gchar* file_to_prepare_get_parent_path (FileToPrepare* self); gchar* file_to_prepare_get_path (FileToPrepare* self); gchar* file_to_prepare_get_basename (FileToPrepare* self); gboolean file_to_prepare_is_directory (FileToPrepare* self); -static void file_to_prepare_finalize (FileToPrepare* obj); +static void file_to_prepare_finalize (FileToPrepare * obj); #define WORK_SNIFFER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_WORK_SNIFFER, WorkSnifferPrivate)) enum { WORK_SNIFFER_DUMMY_PROPERTY }; static void work_sniffer_real_execute (BackgroundJob* base); static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GError** error); -static gint __lambda10_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b); +static gint __lambda11_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b); gint utf8_cs_compare (void* a, void* b); -static gint ___lambda10__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); -void disassemble_filename (const gchar* basename, gchar** name, gchar** ext); +static gint ___lambda11__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); +void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); gboolean is_string_empty (const gchar* s); gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); @@ -2147,20 +2162,20 @@ GCancellable* background_job_get_cancellable (BackgroundJob* self); gboolean photo_is_file_image (GFile* file); gboolean photo_file_format_is_file_supported (GFile* file); gboolean video_reader_is_supported_video_file (GFile* file); -static void work_sniffer_finalize (BackgroundJob* obj); +static void work_sniffer_finalize (BackgroundJob * obj); enum { PREPARED_FILE_DUMMY_PROPERTY }; PreparedFile* prepared_file_new (BatchImportJob* job, GFile* file, GFile* associated_file, const gchar* source_id, const gchar* dest_id, gboolean copy_to_library, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, guint64 filesize, gboolean is_video); PreparedFile* prepared_file_construct (GType object_type, BatchImportJob* job, GFile* file, GFile* associated_file, const gchar* source_id, const gchar* dest_id, gboolean copy_to_library, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, guint64 filesize, gboolean is_video); -static void prepared_file_finalize (PreparedFile* obj); +static void prepared_file_finalize (PreparedFile * obj); enum { PREPARED_FILE_CLUSTER_DUMMY_PROPERTY }; PreparedFileCluster* prepared_file_cluster_new (GeeArrayList* list); PreparedFileCluster* prepared_file_cluster_construct (GType object_type, GeeArrayList* list); InterlockedNotificationObject* interlocked_notification_object_construct (GType object_type); -static void prepared_file_cluster_finalize (NotificationObject* obj); +static void prepared_file_cluster_finalize (NotificationObject * obj); #define PREPARE_FILES_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PREPARE_FILES_JOB, PrepareFilesJobPrivate)) enum { PREPARE_FILES_JOB_DUMMY_PROPERTY @@ -2169,8 +2184,8 @@ GFile* app_dirs_get_import_dir (void); static gint prepare_files_job_get_test_variable (const gchar* name); void background_job_set_notification_priority (BackgroundJob* self, gint priority); static void prepare_files_job_real_execute (BackgroundJob* base); -static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImportJob* job, GFile** file, gboolean* copy_to_library); -static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, BatchImportJob* job, GFile* file, GFile* associated_file, gboolean copy_to_library, PreparedFile** prepared_file); +static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImportJob* job, GFile* * file, gboolean* copy_to_library); +static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, BatchImportJob* job, GFile* file, GFile* associated_file, gboolean copy_to_library, PreparedFile* * prepared_file); void background_job_notify (BackgroundJob* self, NotificationCallback callback, void* callback_target, NotificationObject* user); gchar* md5_file (GFile* file, GError** error); PhotoFileFormat photo_file_format_get_by_file_extension (GFile* file); @@ -2195,7 +2210,7 @@ PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_preview, int* result_length1); gchar* md5_binary (guint8* buffer, gsize length); guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_length1); -static void prepare_files_job_finalize (BackgroundJob* obj); +static void prepare_files_job_finalize (BackgroundJob * obj); enum { READY_FOR_IMPORT_DUMMY_PROPERTY }; @@ -2208,7 +2223,7 @@ void value_set_video_row (GValue* value, gpointer v_object); void value_take_video_row (GValue* value, gpointer v_object); gpointer value_get_video_row (const GValue* value); GType video_row_get_type (void) G_GNUC_CONST; -static void ready_for_import_finalize (ReadyForImport* obj); +static void ready_for_import_finalize (ReadyForImport * obj); #define PREPARED_FILE_IMPORT_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJobPrivate)) enum { PREPARED_FILE_IMPORT_JOB_DUMMY_PROPERTY @@ -2224,19 +2239,19 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params); PhotoImportParams* photo_import_params_new (GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails); PhotoImportParams* photo_import_params_construct (GType object_type, GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails); ImportResult photo_prepare_for_import (PhotoImportParams* params); -static void prepared_file_import_job_finalize (BackgroundJob* obj); +static void prepared_file_import_job_finalize (BackgroundJob * obj); enum { COMPLETED_IMPORT_OBJECT_DUMMY_PROPERTY }; GType thumbnail_cache_size_get_type (void) G_GNUC_CONST; GdkPixbuf* thumbnails_get (Thumbnails* self, ThumbnailCacheSize size); -static void completed_import_object_finalize (CompletedImportObject* obj); +static void completed_import_object_finalize (CompletedImportObject * obj); enum { THUMBNAIL_WRITER_JOB_DUMMY_PROPERTY }; static void thumbnail_writer_job_real_execute (BackgroundJob* base); void thumbnail_cache_import_thumbnails (ThumbnailSource* source, Thumbnails* thumbnails, gboolean force, GError** error); -static void thumbnail_writer_job_finalize (BackgroundJob* obj); +static void thumbnail_writer_job_finalize (BackgroundJob * obj); gchar* import_result_to_string (ImportResult self) { @@ -2245,80 +2260,65 @@ gchar* import_result_to_string (ImportResult self) { switch (self) { #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_SUCCESS: -#line 2249 "BatchImport.c" +#line 2264 "BatchImport.c" { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; -#line 26 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = _ ("Success"); + gchar* _tmp0_; #line 26 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Success")); #line 26 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp1_; + result = _tmp0_; #line 26 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2261 "BatchImport.c" +#line 2273 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_FILE_ERROR: -#line 2265 "BatchImport.c" +#line 2277 "BatchImport.c" { - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 29 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp2_ = _ ("File error"); + gchar* _tmp1_; #line 29 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (_ ("File error")); #line 29 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp3_; + result = _tmp1_; #line 29 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2277 "BatchImport.c" +#line 2286 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_DECODE_ERROR: -#line 2281 "BatchImport.c" +#line 2290 "BatchImport.c" { - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + gchar* _tmp2_; #line 32 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp4_ = _ ("Unable to decode file"); + _tmp2_ = g_strdup (_ ("Unable to decode file")); #line 32 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp5_ = g_strdup (_tmp4_); -#line 32 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp5_; + result = _tmp2_; #line 32 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2293 "BatchImport.c" +#line 2299 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_DATABASE_ERROR: -#line 2297 "BatchImport.c" +#line 2303 "BatchImport.c" { - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; -#line 35 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp6_ = _ ("Database error"); + gchar* _tmp3_; #line 35 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp3_ = g_strdup (_ ("Database error")); #line 35 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp7_; + result = _tmp3_; #line 35 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2309 "BatchImport.c" +#line 2312 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_USER_ABORT: -#line 2313 "BatchImport.c" +#line 2316 "BatchImport.c" { - const gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; -#line 38 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp8_ = _ ("User aborted import"); + gchar* _tmp4_; #line 38 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp9_ = g_strdup (_tmp8_); + _tmp4_ = g_strdup (_ ("User aborted import")); #line 38 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp9_; + result = _tmp4_; #line 38 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; #line 2325 "BatchImport.c" @@ -2327,159 +2327,129 @@ gchar* import_result_to_string (ImportResult self) { case IMPORT_RESULT_NOT_A_FILE: #line 2329 "BatchImport.c" { - const gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; -#line 41 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp10_ = _ ("Not a file"); + gchar* _tmp5_; #line 41 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp11_ = g_strdup (_tmp10_); + _tmp5_ = g_strdup (_ ("Not a file")); #line 41 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp11_; + result = _tmp5_; #line 41 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2341 "BatchImport.c" +#line 2338 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_PHOTO_EXISTS: -#line 2345 "BatchImport.c" +#line 2342 "BatchImport.c" { - const gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; -#line 44 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp12_ = _ ("File already exists in database"); + gchar* _tmp6_; #line 44 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp13_ = g_strdup (_tmp12_); + _tmp6_ = g_strdup (_ ("File already exists in database")); #line 44 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp13_; + result = _tmp6_; #line 44 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2357 "BatchImport.c" +#line 2351 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_UNSUPPORTED_FORMAT: -#line 2361 "BatchImport.c" +#line 2355 "BatchImport.c" { - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; + gchar* _tmp7_; #line 47 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp14_ = _ ("Unsupported file format"); + _tmp7_ = g_strdup (_ ("Unsupported file format")); #line 47 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp15_ = g_strdup (_tmp14_); -#line 47 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp15_; + result = _tmp7_; #line 47 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2373 "BatchImport.c" +#line 2364 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_NOT_AN_IMAGE: -#line 2377 "BatchImport.c" +#line 2368 "BatchImport.c" { - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; -#line 50 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp16_ = _ ("Not an image file"); + gchar* _tmp8_; #line 50 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp17_ = g_strdup (_tmp16_); + _tmp8_ = g_strdup (_ ("Not an image file")); #line 50 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp17_; + result = _tmp8_; #line 50 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2389 "BatchImport.c" +#line 2377 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_DISK_FAILURE: -#line 2393 "BatchImport.c" +#line 2381 "BatchImport.c" { - const gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; + gchar* _tmp9_; #line 53 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp18_ = _ ("Disk failure"); + _tmp9_ = g_strdup (_ ("Disk failure")); #line 53 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp19_ = g_strdup (_tmp18_); -#line 53 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp19_; + result = _tmp9_; #line 53 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2405 "BatchImport.c" +#line 2390 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_DISK_FULL: -#line 2409 "BatchImport.c" +#line 2394 "BatchImport.c" { - const gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; -#line 56 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp20_ = _ ("Disk full"); + gchar* _tmp10_; #line 56 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp21_ = g_strdup (_tmp20_); + _tmp10_ = g_strdup (_ ("Disk full")); #line 56 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp21_; + result = _tmp10_; #line 56 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2421 "BatchImport.c" +#line 2403 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_CAMERA_ERROR: -#line 2425 "BatchImport.c" +#line 2407 "BatchImport.c" { - const gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; + gchar* _tmp11_; #line 59 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp22_ = _ ("Camera error"); + _tmp11_ = g_strdup (_ ("Camera error")); #line 59 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp23_ = g_strdup (_tmp22_); -#line 59 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp23_; + result = _tmp11_; #line 59 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2437 "BatchImport.c" +#line 2416 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_FILE_WRITE_ERROR: -#line 2441 "BatchImport.c" +#line 2420 "BatchImport.c" { - const gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; -#line 62 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp24_ = _ ("File write error"); + gchar* _tmp12_; #line 62 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp25_ = g_strdup (_tmp24_); + _tmp12_ = g_strdup (_ ("File write error")); #line 62 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp25_; + result = _tmp12_; #line 62 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2453 "BatchImport.c" +#line 2429 "BatchImport.c" } #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE: -#line 2457 "BatchImport.c" +#line 2433 "BatchImport.c" { - const gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; -#line 65 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp26_ = _ ("Corrupt image file"); + gchar* _tmp13_; #line 65 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp27_ = g_strdup (_tmp26_); + _tmp13_ = g_strdup (_ ("Corrupt image file")); #line 65 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp27_; + result = _tmp13_; #line 65 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2469 "BatchImport.c" +#line 2442 "BatchImport.c" } default: { - const gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; -#line 68 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp28_ = _ ("Imported failed (%d)"); + gchar* _tmp14_; #line 68 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp29_ = g_strdup_printf (_tmp28_, (gint) self); + _tmp14_ = g_strdup_printf (_ ("Imported failed (%d)"), (gint) self); #line 68 "/home/jens/Source/shotwell/src/BatchImport.vala" - result = _tmp29_; + result = _tmp14_; #line 68 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2483 "BatchImport.c" +#line 2453 "BatchImport.c" } } } @@ -2495,13 +2465,13 @@ gboolean import_result_is_abort (ImportResult self) { case IMPORT_RESULT_DISK_FAILURE: #line 73 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_USER_ABORT: -#line 2499 "BatchImport.c" +#line 2469 "BatchImport.c" { #line 77 "/home/jens/Source/shotwell/src/BatchImport.vala" result = TRUE; #line 77 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2505 "BatchImport.c" +#line 2475 "BatchImport.c" } default: { @@ -2509,7 +2479,7 @@ gboolean import_result_is_abort (ImportResult self) { result = FALSE; #line 80 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2513 "BatchImport.c" +#line 2483 "BatchImport.c" } } } @@ -2523,13 +2493,13 @@ gboolean import_result_is_nonuser_abort (ImportResult self) { case IMPORT_RESULT_DISK_FULL: #line 85 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_DISK_FAILURE: -#line 2527 "BatchImport.c" +#line 2497 "BatchImport.c" { #line 88 "/home/jens/Source/shotwell/src/BatchImport.vala" result = TRUE; #line 88 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2533 "BatchImport.c" +#line 2503 "BatchImport.c" } default: { @@ -2537,7 +2507,7 @@ gboolean import_result_is_nonuser_abort (ImportResult self) { result = FALSE; #line 91 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2541 "BatchImport.c" +#line 2511 "BatchImport.c" } } } @@ -2546,23 +2516,23 @@ gboolean import_result_is_nonuser_abort (ImportResult self) { static gpointer _g_error_copy0 (gpointer self) { #line 97 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? g_error_copy (self) : NULL; -#line 2550 "BatchImport.c" +#line 2520 "BatchImport.c" } ImportResult import_result_convert_error (GError* err, ImportResult default_result) { ImportResult result = 0; - GError* _tmp0_ = NULL; - ImportResult _tmp32_ = 0; + GError* _tmp0_; + ImportResult _tmp32_; #line 96 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = err; #line 96 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp0_->domain == G_FILE_ERROR) { -#line 2562 "BatchImport.c" +#line 2532 "BatchImport.c" GError* ferr = NULL; - GError* _tmp1_ = NULL; - GError* _tmp2_ = NULL; - GError* _tmp3_ = NULL; + GError* _tmp1_; + GError* _tmp2_; + GError* _tmp3_; #line 97 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = err; #line 97 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2579,9 +2549,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (ferr); #line 100 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2583 "BatchImport.c" +#line 2553 "BatchImport.c" } else { - GError* _tmp4_ = NULL; + GError* _tmp4_; #line 101 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = ferr; #line 101 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2592,9 +2562,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (ferr); #line 102 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2596 "BatchImport.c" +#line 2566 "BatchImport.c" } else { - GError* _tmp5_ = NULL; + GError* _tmp5_; #line 103 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = ferr; #line 103 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2605,9 +2575,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (ferr); #line 104 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2609 "BatchImport.c" +#line 2579 "BatchImport.c" } else { - GError* _tmp6_ = NULL; + GError* _tmp6_; #line 105 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = ferr; #line 105 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2618,9 +2588,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (ferr); #line 106 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2622 "BatchImport.c" +#line 2592 "BatchImport.c" } else { - GError* _tmp7_ = NULL; + GError* _tmp7_; #line 107 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = ferr; #line 107 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2631,7 +2601,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (ferr); #line 108 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2635 "BatchImport.c" +#line 2605 "BatchImport.c" } else { #line 110 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_FILE_ERROR; @@ -2639,7 +2609,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (ferr); #line 110 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2643 "BatchImport.c" +#line 2613 "BatchImport.c" } } } @@ -2647,18 +2617,18 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu } #line 96 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (ferr); -#line 2651 "BatchImport.c" +#line 2621 "BatchImport.c" } else { - GError* _tmp8_ = NULL; + GError* _tmp8_; #line 111 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = err; #line 111 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp8_->domain == G_IO_ERROR) { -#line 2658 "BatchImport.c" +#line 2628 "BatchImport.c" GError* ioerr = NULL; - GError* _tmp9_ = NULL; - GError* _tmp10_ = NULL; - GError* _tmp11_ = NULL; + GError* _tmp9_; + GError* _tmp10_; + GError* _tmp11_; #line 112 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = err; #line 112 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2675,9 +2645,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (ioerr); #line 115 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2679 "BatchImport.c" +#line 2649 "BatchImport.c" } else { - GError* _tmp12_ = NULL; + GError* _tmp12_; #line 116 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = ioerr; #line 116 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2688,9 +2658,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (ioerr); #line 117 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2692 "BatchImport.c" +#line 2662 "BatchImport.c" } else { - GError* _tmp13_ = NULL; + GError* _tmp13_; #line 118 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = ioerr; #line 118 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2701,9 +2671,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (ioerr); #line 119 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2705 "BatchImport.c" +#line 2675 "BatchImport.c" } else { - GError* _tmp14_ = NULL; + GError* _tmp14_; #line 120 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = ioerr; #line 120 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2714,9 +2684,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (ioerr); #line 121 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2718 "BatchImport.c" +#line 2688 "BatchImport.c" } else { - GError* _tmp15_ = NULL; + GError* _tmp15_; #line 122 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp15_ = ioerr; #line 122 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2727,9 +2697,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (ioerr); #line 123 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2731 "BatchImport.c" +#line 2701 "BatchImport.c" } else { - GError* _tmp16_ = NULL; + GError* _tmp16_; #line 124 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp16_ = ioerr; #line 124 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2740,7 +2710,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (ioerr); #line 125 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2744 "BatchImport.c" +#line 2714 "BatchImport.c" } else { #line 127 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_FILE_ERROR; @@ -2748,7 +2718,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (ioerr); #line 127 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2752 "BatchImport.c" +#line 2722 "BatchImport.c" } } } @@ -2757,9 +2727,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu } #line 111 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (ioerr); -#line 2761 "BatchImport.c" +#line 2731 "BatchImport.c" } else { - GError* _tmp17_ = NULL; + GError* _tmp17_; #line 128 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp17_ = err; #line 128 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2768,18 +2738,18 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu result = IMPORT_RESULT_CAMERA_ERROR; #line 129 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2772 "BatchImport.c" +#line 2742 "BatchImport.c" } else { - GError* _tmp18_ = NULL; + GError* _tmp18_; #line 130 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp18_ = err; #line 130 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp18_->domain == GDK_PIXBUF_ERROR) { -#line 2779 "BatchImport.c" +#line 2749 "BatchImport.c" GError* pixbuferr = NULL; - GError* _tmp19_ = NULL; - GError* _tmp20_ = NULL; - GError* _tmp21_ = NULL; + GError* _tmp19_; + GError* _tmp20_; + GError* _tmp21_; #line 131 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp19_ = err; #line 131 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2796,15 +2766,15 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (pixbuferr); #line 134 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2800 "BatchImport.c" +#line 2770 "BatchImport.c" } else { - GError* _tmp22_ = NULL; + GError* _tmp22_; #line 135 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp22_ = pixbuferr; #line 135 "/home/jens/Source/shotwell/src/BatchImport.vala" if (g_error_matches (_tmp22_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY)) { -#line 2807 "BatchImport.c" - ImportResult _tmp23_ = 0; +#line 2777 "BatchImport.c" + ImportResult _tmp23_; #line 136 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp23_ = default_result; #line 136 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2813,15 +2783,15 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (pixbuferr); #line 136 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2817 "BatchImport.c" +#line 2787 "BatchImport.c" } else { - GError* _tmp24_ = NULL; + GError* _tmp24_; #line 137 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp24_ = pixbuferr; #line 137 "/home/jens/Source/shotwell/src/BatchImport.vala" if (g_error_matches (_tmp24_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_BAD_OPTION)) { -#line 2824 "BatchImport.c" - ImportResult _tmp25_ = 0; +#line 2794 "BatchImport.c" + ImportResult _tmp25_; #line 138 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp25_ = default_result; #line 138 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2830,9 +2800,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (pixbuferr); #line 138 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2834 "BatchImport.c" +#line 2804 "BatchImport.c" } else { - GError* _tmp26_ = NULL; + GError* _tmp26_; #line 139 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp26_ = pixbuferr; #line 139 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2843,15 +2813,15 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (pixbuferr); #line 140 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2847 "BatchImport.c" +#line 2817 "BatchImport.c" } else { - GError* _tmp27_ = NULL; + GError* _tmp27_; #line 141 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp27_ = pixbuferr; #line 141 "/home/jens/Source/shotwell/src/BatchImport.vala" if (g_error_matches (_tmp27_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNSUPPORTED_OPERATION)) { -#line 2854 "BatchImport.c" - ImportResult _tmp28_ = 0; +#line 2824 "BatchImport.c" + ImportResult _tmp28_; #line 142 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp28_ = default_result; #line 142 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2860,15 +2830,15 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (pixbuferr); #line 142 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2864 "BatchImport.c" +#line 2834 "BatchImport.c" } else { - GError* _tmp29_ = NULL; + GError* _tmp29_; #line 143 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp29_ = pixbuferr; #line 143 "/home/jens/Source/shotwell/src/BatchImport.vala" if (g_error_matches (_tmp29_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED)) { -#line 2871 "BatchImport.c" - ImportResult _tmp30_ = 0; +#line 2841 "BatchImport.c" + ImportResult _tmp30_; #line 144 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp30_ = default_result; #line 144 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2877,9 +2847,9 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (pixbuferr); #line 144 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2881 "BatchImport.c" +#line 2851 "BatchImport.c" } else { - ImportResult _tmp31_ = 0; + ImportResult _tmp31_; #line 146 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp31_ = default_result; #line 146 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -2888,7 +2858,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu _g_error_free0 (pixbuferr); #line 146 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2892 "BatchImport.c" +#line 2862 "BatchImport.c" } } } @@ -2897,7 +2867,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu } #line 130 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (pixbuferr); -#line 2901 "BatchImport.c" +#line 2871 "BatchImport.c" } } } @@ -2908,7 +2878,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu result = _tmp32_; #line 149 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 2912 "BatchImport.c" +#line 2882 "BatchImport.c" } @@ -2929,7 +2899,7 @@ static gchar* batch_import_job_real_get_dest_identifier (BatchImportJob* self) { g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_dest_identifier'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 161 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 2933 "BatchImport.c" +#line 2903 "BatchImport.c" } @@ -2938,7 +2908,7 @@ gchar* batch_import_job_get_dest_identifier (BatchImportJob* self) { g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL); #line 161 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->get_dest_identifier (self); -#line 2942 "BatchImport.c" +#line 2912 "BatchImport.c" } @@ -2947,7 +2917,7 @@ static gchar* batch_import_job_real_get_source_identifier (BatchImportJob* self) g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_source_identifier'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 163 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 2951 "BatchImport.c" +#line 2921 "BatchImport.c" } @@ -2956,7 +2926,7 @@ gchar* batch_import_job_get_source_identifier (BatchImportJob* self) { g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL); #line 163 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->get_source_identifier (self); -#line 2960 "BatchImport.c" +#line 2930 "BatchImport.c" } @@ -2966,7 +2936,7 @@ static gboolean batch_import_job_real_is_directory (BatchImportJob* self) { g_critical ("Type `%s' does not implement abstract method `batch_import_job_is_directory'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 165 "/home/jens/Source/shotwell/src/BatchImport.vala" return _tmp0_; -#line 2970 "BatchImport.c" +#line 2940 "BatchImport.c" } @@ -2975,7 +2945,7 @@ gboolean batch_import_job_is_directory (BatchImportJob* self) { g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE); #line 165 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->is_directory (self); -#line 2979 "BatchImport.c" +#line 2949 "BatchImport.c" } @@ -2984,7 +2954,7 @@ static gchar* batch_import_job_real_get_basename (BatchImportJob* self) { g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_basename'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 167 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 2988 "BatchImport.c" +#line 2958 "BatchImport.c" } @@ -2993,7 +2963,7 @@ gchar* batch_import_job_get_basename (BatchImportJob* self) { g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL); #line 167 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->get_basename (self); -#line 2997 "BatchImport.c" +#line 2967 "BatchImport.c" } @@ -3002,7 +2972,7 @@ static gchar* batch_import_job_real_get_path (BatchImportJob* self) { g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_path'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 169 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 3006 "BatchImport.c" +#line 2976 "BatchImport.c" } @@ -3011,7 +2981,7 @@ gchar* batch_import_job_get_path (BatchImportJob* self) { g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL); #line 169 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->get_path (self); -#line 3015 "BatchImport.c" +#line 2985 "BatchImport.c" } @@ -3021,7 +2991,7 @@ static DuplicatedFile* batch_import_job_real_get_duplicated_file (BatchImportJob result = NULL; #line 172 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3025 "BatchImport.c" +#line 2995 "BatchImport.c" } @@ -3030,7 +3000,7 @@ DuplicatedFile* batch_import_job_get_duplicated_file (BatchImportJob* self) { g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL); #line 171 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->get_duplicated_file (self); -#line 3034 "BatchImport.c" +#line 3004 "BatchImport.c" } @@ -3039,7 +3009,7 @@ static void batch_import_job_real_set_associated (BatchImportJob* self, BatchImp g_critical ("Type `%s' does not implement abstract method `batch_import_job_set_associated'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 176 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 3043 "BatchImport.c" +#line 3013 "BatchImport.c" } @@ -3048,45 +3018,45 @@ void batch_import_job_set_associated (BatchImportJob* self, BatchImportJob* asso g_return_if_fail (IS_BATCH_IMPORT_JOB (self)); #line 176 "/home/jens/Source/shotwell/src/BatchImport.vala" BATCH_IMPORT_JOB_GET_CLASS (self)->set_associated (self, associated); -#line 3052 "BatchImport.c" +#line 3022 "BatchImport.c" } -static gboolean batch_import_job_real_determine_file_size (BatchImportJob* self, guint64* filesize, GFile** file_or_dir) { +static gboolean batch_import_job_real_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir) { gboolean _tmp0_ = FALSE; #line 183 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("Type `%s' does not implement abstract method `batch_import_job_determine_file_size'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 183 "/home/jens/Source/shotwell/src/BatchImport.vala" return _tmp0_; -#line 3062 "BatchImport.c" +#line 3032 "BatchImport.c" } -gboolean batch_import_job_determine_file_size (BatchImportJob* self, guint64* filesize, GFile** file_or_dir) { +gboolean batch_import_job_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir) { #line 183 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE); #line 183 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->determine_file_size (self, filesize, file_or_dir); -#line 3071 "BatchImport.c" +#line 3041 "BatchImport.c" } -static gboolean batch_import_job_real_prepare (BatchImportJob* self, GFile** file_to_import, gboolean* copy_to_library, GError** error) { +static gboolean batch_import_job_real_prepare (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error) { gboolean _tmp0_ = FALSE; #line 186 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("Type `%s' does not implement abstract method `batch_import_job_prepare'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 186 "/home/jens/Source/shotwell/src/BatchImport.vala" return _tmp0_; -#line 3081 "BatchImport.c" +#line 3051 "BatchImport.c" } -gboolean batch_import_job_prepare (BatchImportJob* self, GFile** file_to_import, gboolean* copy_to_library, GError** error) { +gboolean batch_import_job_prepare (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error) { #line 186 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE); #line 186 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->prepare (self, file_to_import, copy_to_library, error); -#line 3090 "BatchImport.c" +#line 3060 "BatchImport.c" } @@ -3100,7 +3070,7 @@ static gboolean batch_import_job_real_complete (BatchImportJob* self, MediaSourc result = FALSE; #line 197 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3104 "BatchImport.c" +#line 3074 "BatchImport.c" } @@ -3109,7 +3079,7 @@ gboolean batch_import_job_complete (BatchImportJob* self, MediaSource* source, B g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE); #line 196 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->complete (self, source, import_roll, error); -#line 3113 "BatchImport.c" +#line 3083 "BatchImport.c" } @@ -3119,7 +3089,7 @@ static time_t batch_import_job_real_get_exposure_time_override (BatchImportJob* result = (time_t) 0; #line 203 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3123 "BatchImport.c" +#line 3093 "BatchImport.c" } @@ -3128,7 +3098,7 @@ time_t batch_import_job_get_exposure_time_override (BatchImportJob* self) { g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), 0); #line 202 "/home/jens/Source/shotwell/src/BatchImport.vala" return BATCH_IMPORT_JOB_GET_CLASS (self)->get_exposure_time_override (self); -#line 3132 "BatchImport.c" +#line 3102 "BatchImport.c" } @@ -3138,14 +3108,14 @@ BatchImportJob* batch_import_job_construct (GType object_type) { self = (BatchImportJob*) g_type_create_instance (object_type); #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 3142 "BatchImport.c" +#line 3112 "BatchImport.c" } static void value_batch_import_job_init (GValue* value) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 3149 "BatchImport.c" +#line 3119 "BatchImport.c" } @@ -3154,7 +3124,7 @@ static void value_batch_import_job_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_job_unref (value->data[0].v_pointer); -#line 3158 "BatchImport.c" +#line 3128 "BatchImport.c" } } @@ -3164,11 +3134,11 @@ static void value_batch_import_job_copy_value (const GValue* src_value, GValue* if (src_value->data[0].v_pointer) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = batch_import_job_ref (src_value->data[0].v_pointer); -#line 3168 "BatchImport.c" +#line 3138 "BatchImport.c" } else { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = NULL; -#line 3172 "BatchImport.c" +#line 3142 "BatchImport.c" } } @@ -3176,66 +3146,66 @@ static void value_batch_import_job_copy_value (const GValue* src_value, GValue* static gpointer value_batch_import_job_peek_pointer (const GValue* value) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 3180 "BatchImport.c" +#line 3150 "BatchImport.c" } static gchar* value_batch_import_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" if (collect_values[0].v_pointer) { -#line 3187 "BatchImport.c" - BatchImportJob* object; +#line 3157 "BatchImport.c" + BatchImportJob * object; object = collect_values[0].v_pointer; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" if (object->parent_instance.g_class == NULL) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3194 "BatchImport.c" +#line 3164 "BatchImport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3198 "BatchImport.c" +#line 3168 "BatchImport.c" } #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = batch_import_job_ref (object); -#line 3202 "BatchImport.c" +#line 3172 "BatchImport.c" } else { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 3206 "BatchImport.c" +#line 3176 "BatchImport.c" } #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 3210 "BatchImport.c" +#line 3180 "BatchImport.c" } static gchar* value_batch_import_job_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - BatchImportJob** object_p; + BatchImportJob ** object_p; object_p = collect_values[0].v_pointer; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!object_p) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3221 "BatchImport.c" +#line 3191 "BatchImport.c" } #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!value->data[0].v_pointer) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = NULL; -#line 3227 "BatchImport.c" +#line 3197 "BatchImport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = value->data[0].v_pointer; -#line 3231 "BatchImport.c" +#line 3201 "BatchImport.c" } else { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = batch_import_job_ref (value->data[0].v_pointer); -#line 3235 "BatchImport.c" +#line 3205 "BatchImport.c" } #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 3239 "BatchImport.c" +#line 3209 "BatchImport.c" } @@ -3249,7 +3219,7 @@ GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, c G_PARAM_SPEC (spec)->value_type = object_type; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return G_PARAM_SPEC (spec); -#line 3253 "BatchImport.c" +#line 3223 "BatchImport.c" } @@ -3258,12 +3228,12 @@ gpointer value_get_batch_import_job (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_JOB), NULL); #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 3262 "BatchImport.c" +#line 3232 "BatchImport.c" } void value_set_batch_import_job (GValue* value, gpointer v_object) { - BatchImportJob* old; + BatchImportJob * old; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_JOB)); #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3278,23 +3248,23 @@ void value_set_batch_import_job (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_job_ref (value->data[0].v_pointer); -#line 3282 "BatchImport.c" +#line 3252 "BatchImport.c" } else { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 3286 "BatchImport.c" +#line 3256 "BatchImport.c" } #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_job_unref (old); -#line 3292 "BatchImport.c" +#line 3262 "BatchImport.c" } } void value_take_batch_import_job (GValue* value, gpointer v_object) { - BatchImportJob* old; + BatchImportJob * old; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_JOB)); #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3307,17 +3277,17 @@ void value_take_batch_import_job (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 3311 "BatchImport.c" +#line 3281 "BatchImport.c" } else { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 3315 "BatchImport.c" +#line 3285 "BatchImport.c" } #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_job_unref (old); -#line 3321 "BatchImport.c" +#line 3291 "BatchImport.c" } } @@ -3328,45 +3298,45 @@ static void batch_import_job_class_init (BatchImportJobClass * klass) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" ((BatchImportJobClass *) klass)->finalize = batch_import_job_finalize; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*)(BatchImportJob*)) batch_import_job_real_get_dest_identifier; + ((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*) (BatchImportJob *)) batch_import_job_real_get_dest_identifier; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*)(BatchImportJob*)) batch_import_job_real_get_source_identifier; + ((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*) (BatchImportJob *)) batch_import_job_real_get_source_identifier; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->is_directory = (gboolean (*)(BatchImportJob*)) batch_import_job_real_is_directory; + ((BatchImportJobClass *) klass)->is_directory = (gboolean (*) (BatchImportJob *)) batch_import_job_real_is_directory; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->get_basename = (gchar* (*)(BatchImportJob*)) batch_import_job_real_get_basename; + ((BatchImportJobClass *) klass)->get_basename = (gchar* (*) (BatchImportJob *)) batch_import_job_real_get_basename; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->get_path = (gchar* (*)(BatchImportJob*)) batch_import_job_real_get_path; + ((BatchImportJobClass *) klass)->get_path = (gchar* (*) (BatchImportJob *)) batch_import_job_real_get_path; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->get_duplicated_file = (DuplicatedFile* (*)(BatchImportJob*)) batch_import_job_real_get_duplicated_file; + ((BatchImportJobClass *) klass)->get_duplicated_file = (DuplicatedFile* (*) (BatchImportJob *)) batch_import_job_real_get_duplicated_file; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->set_associated = (void (*)(BatchImportJob*, BatchImportJob*)) batch_import_job_real_set_associated; + ((BatchImportJobClass *) klass)->set_associated = (void (*) (BatchImportJob *, BatchImportJob*)) batch_import_job_real_set_associated; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*)(BatchImportJob*, guint64*, GFile**)) batch_import_job_real_determine_file_size; + ((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*) (BatchImportJob *, guint64*, GFile* *)) batch_import_job_real_determine_file_size; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->prepare = (gboolean (*)(BatchImportJob*, GFile**, gboolean*, GError**)) batch_import_job_real_prepare; + ((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) batch_import_job_real_prepare; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->complete = (gboolean (*)(BatchImportJob*, MediaSource*, BatchImportRoll*, GError**)) batch_import_job_real_complete; + ((BatchImportJobClass *) klass)->complete = (gboolean (*) (BatchImportJob *, MediaSource*, BatchImportRoll*, GError**)) batch_import_job_real_complete; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->get_exposure_time_override = (time_t (*)(BatchImportJob*)) batch_import_job_real_get_exposure_time_override; -#line 3353 "BatchImport.c" + ((BatchImportJobClass *) klass)->get_exposure_time_override = (time_t (*) (BatchImportJob *)) batch_import_job_real_get_exposure_time_override; +#line 3323 "BatchImport.c" } static void batch_import_job_instance_init (BatchImportJob * self) { #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ref_count = 1; -#line 3360 "BatchImport.c" +#line 3330 "BatchImport.c" } -static void batch_import_job_finalize (BatchImportJob* obj) { +static void batch_import_job_finalize (BatchImportJob * obj) { BatchImportJob * self; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT_JOB, BatchImportJob); #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" g_signal_handlers_destroy (self); -#line 3370 "BatchImport.c" +#line 3340 "BatchImport.c" } @@ -3385,18 +3355,18 @@ GType batch_import_job_get_type (void) { gpointer batch_import_job_ref (gpointer instance) { - BatchImportJob* self; + BatchImportJob * self; self = instance; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" g_atomic_int_inc (&self->ref_count); #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" return instance; -#line 3395 "BatchImport.c" +#line 3365 "BatchImport.c" } void batch_import_job_unref (gpointer instance) { - BatchImportJob* self; + BatchImportJob * self; self = instance; #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -3404,7 +3374,7 @@ void batch_import_job_unref (gpointer instance) { BATCH_IMPORT_JOB_GET_CLASS (self)->finalize (self); #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3408 "BatchImport.c" +#line 3378 "BatchImport.c" } } @@ -3412,15 +3382,15 @@ void batch_import_job_unref (gpointer instance) { static gpointer _g_object_ref0 (gpointer self) { #line 213 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? g_object_ref (self) : NULL; -#line 3416 "BatchImport.c" +#line 3386 "BatchImport.c" } FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library) { FileImportJob* self = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GFile* _tmp0_; + GFile* _tmp1_; + gboolean _tmp2_; #line 212 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_IS_FILE (file_or_dir), NULL); #line 212 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3439,22 +3409,22 @@ FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, self->priv->copy_to_library = _tmp2_; #line 212 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 3443 "BatchImport.c" +#line 3413 "BatchImport.c" } FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library) { #line 212 "/home/jens/Source/shotwell/src/BatchImport.vala" return file_import_job_construct (TYPE_FILE_IMPORT_JOB, file_or_dir, copy_to_library); -#line 3450 "BatchImport.c" +#line 3420 "BatchImport.c" } static gchar* file_import_job_real_get_dest_identifier (BatchImportJob* base) { FileImportJob * self; gchar* result = NULL; - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; #line 217 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob); #line 218 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3465,15 +3435,15 @@ static gchar* file_import_job_real_get_dest_identifier (BatchImportJob* base) { result = _tmp1_; #line 218 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3469 "BatchImport.c" +#line 3439 "BatchImport.c" } static gchar* file_import_job_real_get_source_identifier (BatchImportJob* base) { FileImportJob * self; gchar* result = NULL; - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; #line 221 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob); #line 222 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3484,15 +3454,15 @@ static gchar* file_import_job_real_get_source_identifier (BatchImportJob* base) result = _tmp1_; #line 222 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3488 "BatchImport.c" +#line 3458 "BatchImport.c" } static gboolean file_import_job_real_is_directory (BatchImportJob* base) { FileImportJob * self; gboolean result = FALSE; - GFile* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + GFile* _tmp0_; + gboolean _tmp1_; #line 225 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob); #line 226 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3503,15 +3473,15 @@ static gboolean file_import_job_real_is_directory (BatchImportJob* base) { result = _tmp1_; #line 226 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3507 "BatchImport.c" +#line 3477 "BatchImport.c" } static gchar* file_import_job_real_get_basename (BatchImportJob* base) { FileImportJob * self; gchar* result = NULL; - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; #line 229 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob); #line 230 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3522,7 +3492,7 @@ static gchar* file_import_job_real_get_basename (BatchImportJob* base) { result = _tmp1_; #line 230 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3526 "BatchImport.c" +#line 3496 "BatchImport.c" } @@ -3530,16 +3500,16 @@ static gchar* file_import_job_real_get_path (BatchImportJob* base) { FileImportJob * self; gchar* result = NULL; gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + gboolean _tmp1_; #line 233 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob); #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = batch_import_job_is_directory (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BATCH_IMPORT_JOB, BatchImportJob)); #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp1_) { -#line 3541 "BatchImport.c" - GFile* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; +#line 3511 "BatchImport.c" + GFile* _tmp2_; + gchar* _tmp3_; #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = self->priv->file_or_dir; #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3548,12 +3518,12 @@ static gchar* file_import_job_real_get_path (BatchImportJob* base) { _g_free0 (_tmp0_); #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp3_; -#line 3552 "BatchImport.c" +#line 3522 "BatchImport.c" } else { - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; + GFile* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; + gchar* _tmp7_; #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = self->priv->file_or_dir; #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3568,27 +3538,27 @@ static gchar* file_import_job_real_get_path (BatchImportJob* base) { _tmp0_ = _tmp7_; #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp6_); -#line 3572 "BatchImport.c" +#line 3542 "BatchImport.c" } #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp0_; #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3578 "BatchImport.c" +#line 3548 "BatchImport.c" } static gpointer _batch_import_job_ref0 (gpointer self) { #line 238 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? batch_import_job_ref (self) : NULL; -#line 3585 "BatchImport.c" +#line 3555 "BatchImport.c" } static void file_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated) { FileImportJob * self; - BatchImportJob* _tmp0_ = NULL; - FileImportJob* _tmp1_ = NULL; + BatchImportJob* _tmp0_; + FileImportJob* _tmp1_; #line 237 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob); #line 237 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3601,17 +3571,17 @@ static void file_import_job_real_set_associated (BatchImportJob* base, BatchImpo _batch_import_job_unref0 (self->priv->associated); #line 238 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->associated = _tmp1_; -#line 3605 "BatchImport.c" +#line 3575 "BatchImport.c" } -static gboolean file_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile** file) { +static gboolean file_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file) { FileImportJob * self; guint64 _vala_filesize = 0ULL; GFile* _vala_file = NULL; gboolean result = FALSE; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; #line 241 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob); #line 242 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3630,32 +3600,32 @@ static gboolean file_import_job_real_determine_file_size (BatchImportJob* base, if (filesize) { #line 245 "/home/jens/Source/shotwell/src/BatchImport.vala" *filesize = _vala_filesize; -#line 3634 "BatchImport.c" +#line 3604 "BatchImport.c" } #line 245 "/home/jens/Source/shotwell/src/BatchImport.vala" if (file) { #line 245 "/home/jens/Source/shotwell/src/BatchImport.vala" *file = _vala_file; -#line 3640 "BatchImport.c" +#line 3610 "BatchImport.c" } else { #line 245 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_vala_file); -#line 3644 "BatchImport.c" +#line 3614 "BatchImport.c" } #line 245 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3648 "BatchImport.c" +#line 3618 "BatchImport.c" } -static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile** file_to_import, gboolean* copy, GError** error) { +static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy, GError** error) { FileImportJob * self; GFile* _vala_file_to_import = NULL; gboolean _vala_copy = FALSE; gboolean result = FALSE; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GFile* _tmp0_; + GFile* _tmp1_; + gboolean _tmp2_; #line 248 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob); #line 249 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3676,28 +3646,28 @@ static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile** file if (file_to_import) { #line 252 "/home/jens/Source/shotwell/src/BatchImport.vala" *file_to_import = _vala_file_to_import; -#line 3680 "BatchImport.c" +#line 3650 "BatchImport.c" } else { #line 252 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_vala_file_to_import); -#line 3684 "BatchImport.c" +#line 3654 "BatchImport.c" } #line 252 "/home/jens/Source/shotwell/src/BatchImport.vala" if (copy) { #line 252 "/home/jens/Source/shotwell/src/BatchImport.vala" *copy = _vala_copy; -#line 3690 "BatchImport.c" +#line 3660 "BatchImport.c" } #line 252 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3694 "BatchImport.c" +#line 3664 "BatchImport.c" } GFile* file_import_job_get_file (FileImportJob* self) { GFile* result = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; #line 255 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_FILE_IMPORT_JOB (self), NULL); #line 256 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3708,7 +3678,7 @@ GFile* file_import_job_get_file (FileImportJob* self) { result = _tmp1_; #line 256 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 3712 "BatchImport.c" +#line 3682 "BatchImport.c" } @@ -3720,22 +3690,22 @@ static void file_import_job_class_init (FileImportJobClass * klass) { #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_class_add_private (klass, sizeof (FileImportJobPrivate)); #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*)(BatchImportJob*)) file_import_job_real_get_dest_identifier; + ((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*) (BatchImportJob *)) file_import_job_real_get_dest_identifier; #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*)(BatchImportJob*)) file_import_job_real_get_source_identifier; + ((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*) (BatchImportJob *)) file_import_job_real_get_source_identifier; #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->is_directory = (gboolean (*)(BatchImportJob*)) file_import_job_real_is_directory; + ((BatchImportJobClass *) klass)->is_directory = (gboolean (*) (BatchImportJob *)) file_import_job_real_is_directory; #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->get_basename = (gchar* (*)(BatchImportJob*)) file_import_job_real_get_basename; + ((BatchImportJobClass *) klass)->get_basename = (gchar* (*) (BatchImportJob *)) file_import_job_real_get_basename; #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->get_path = (gchar* (*)(BatchImportJob*)) file_import_job_real_get_path; + ((BatchImportJobClass *) klass)->get_path = (gchar* (*) (BatchImportJob *)) file_import_job_real_get_path; #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->set_associated = (void (*)(BatchImportJob*, BatchImportJob*)) file_import_job_real_set_associated; + ((BatchImportJobClass *) klass)->set_associated = (void (*) (BatchImportJob *, BatchImportJob*)) file_import_job_real_set_associated; #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*)(BatchImportJob*, guint64*, GFile**)) file_import_job_real_determine_file_size; + ((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*) (BatchImportJob *, guint64*, GFile* *)) file_import_job_real_determine_file_size; #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BatchImportJobClass *) klass)->prepare = (gboolean (*)(BatchImportJob*, GFile**, gboolean*, GError**)) file_import_job_real_prepare; -#line 3739 "BatchImport.c" + ((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) file_import_job_real_prepare; +#line 3709 "BatchImport.c" } @@ -3744,11 +3714,11 @@ static void file_import_job_instance_init (FileImportJob * self) { self->priv = FILE_IMPORT_JOB_GET_PRIVATE (self); #line 210 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->associated = NULL; -#line 3748 "BatchImport.c" +#line 3718 "BatchImport.c" } -static void file_import_job_finalize (BatchImportJob* obj) { +static void file_import_job_finalize (BatchImportJob * obj) { FileImportJob * self; #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FILE_IMPORT_JOB, FileImportJob); @@ -3758,7 +3728,7 @@ static void file_import_job_finalize (BatchImportJob* obj) { _batch_import_job_unref0 (self->priv->associated); #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala" BATCH_IMPORT_JOB_CLASS (file_import_job_parent_class)->finalize (obj); -#line 3762 "BatchImport.c" +#line 3732 "BatchImport.c" } @@ -3785,21 +3755,21 @@ BatchImportRoll* batch_import_roll_construct (GType object_type) { self->import_id = _tmp0_; #line 267 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 3789 "BatchImport.c" +#line 3759 "BatchImport.c" } BatchImportRoll* batch_import_roll_new (void) { #line 267 "/home/jens/Source/shotwell/src/BatchImport.vala" return batch_import_roll_construct (TYPE_BATCH_IMPORT_ROLL); -#line 3796 "BatchImport.c" +#line 3766 "BatchImport.c" } static void value_batch_import_roll_init (GValue* value) { #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 3803 "BatchImport.c" +#line 3773 "BatchImport.c" } @@ -3808,7 +3778,7 @@ static void value_batch_import_roll_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_roll_unref (value->data[0].v_pointer); -#line 3812 "BatchImport.c" +#line 3782 "BatchImport.c" } } @@ -3818,11 +3788,11 @@ static void value_batch_import_roll_copy_value (const GValue* src_value, GValue* if (src_value->data[0].v_pointer) { #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = batch_import_roll_ref (src_value->data[0].v_pointer); -#line 3822 "BatchImport.c" +#line 3792 "BatchImport.c" } else { #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = NULL; -#line 3826 "BatchImport.c" +#line 3796 "BatchImport.c" } } @@ -3830,66 +3800,66 @@ static void value_batch_import_roll_copy_value (const GValue* src_value, GValue* static gpointer value_batch_import_roll_peek_pointer (const GValue* value) { #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 3834 "BatchImport.c" +#line 3804 "BatchImport.c" } static gchar* value_batch_import_roll_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" if (collect_values[0].v_pointer) { -#line 3841 "BatchImport.c" - BatchImportRoll* object; +#line 3811 "BatchImport.c" + BatchImportRoll * object; object = collect_values[0].v_pointer; #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" if (object->parent_instance.g_class == NULL) { #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3848 "BatchImport.c" +#line 3818 "BatchImport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3852 "BatchImport.c" +#line 3822 "BatchImport.c" } #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = batch_import_roll_ref (object); -#line 3856 "BatchImport.c" +#line 3826 "BatchImport.c" } else { #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 3860 "BatchImport.c" +#line 3830 "BatchImport.c" } #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 3864 "BatchImport.c" +#line 3834 "BatchImport.c" } static gchar* value_batch_import_roll_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - BatchImportRoll** object_p; + BatchImportRoll ** object_p; object_p = collect_values[0].v_pointer; #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!object_p) { #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3875 "BatchImport.c" +#line 3845 "BatchImport.c" } #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!value->data[0].v_pointer) { #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = NULL; -#line 3881 "BatchImport.c" +#line 3851 "BatchImport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = value->data[0].v_pointer; -#line 3885 "BatchImport.c" +#line 3855 "BatchImport.c" } else { #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = batch_import_roll_ref (value->data[0].v_pointer); -#line 3889 "BatchImport.c" +#line 3859 "BatchImport.c" } #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 3893 "BatchImport.c" +#line 3863 "BatchImport.c" } @@ -3903,7 +3873,7 @@ GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" return G_PARAM_SPEC (spec); -#line 3907 "BatchImport.c" +#line 3877 "BatchImport.c" } @@ -3912,12 +3882,12 @@ gpointer value_get_batch_import_roll (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_ROLL), NULL); #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 3916 "BatchImport.c" +#line 3886 "BatchImport.c" } void value_set_batch_import_roll (GValue* value, gpointer v_object) { - BatchImportRoll* old; + BatchImportRoll * old; #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_ROLL)); #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3932,23 +3902,23 @@ void value_set_batch_import_roll (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_roll_ref (value->data[0].v_pointer); -#line 3936 "BatchImport.c" +#line 3906 "BatchImport.c" } else { #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 3940 "BatchImport.c" +#line 3910 "BatchImport.c" } #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_roll_unref (old); -#line 3946 "BatchImport.c" +#line 3916 "BatchImport.c" } } void value_take_batch_import_roll (GValue* value, gpointer v_object) { - BatchImportRoll* old; + BatchImportRoll * old; #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_ROLL)); #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -3961,17 +3931,17 @@ void value_take_batch_import_roll (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 3965 "BatchImport.c" +#line 3935 "BatchImport.c" } else { #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 3969 "BatchImport.c" +#line 3939 "BatchImport.c" } #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_roll_unref (old); -#line 3975 "BatchImport.c" +#line 3945 "BatchImport.c" } } @@ -3981,23 +3951,23 @@ static void batch_import_roll_class_init (BatchImportRollClass * klass) { batch_import_roll_parent_class = g_type_class_peek_parent (klass); #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" ((BatchImportRollClass *) klass)->finalize = batch_import_roll_finalize; -#line 3985 "BatchImport.c" +#line 3955 "BatchImport.c" } static void batch_import_roll_instance_init (BatchImportRoll * self) { - ViewCollection* _tmp0_ = NULL; + ViewCollection* _tmp0_; #line 265 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = view_collection_new ("BatchImportRoll generated events"); #line 265 "/home/jens/Source/shotwell/src/BatchImport.vala" self->generated_events = _tmp0_; #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ref_count = 1; -#line 3997 "BatchImport.c" +#line 3967 "BatchImport.c" } -static void batch_import_roll_finalize (BatchImportRoll* obj) { +static void batch_import_roll_finalize (BatchImportRoll * obj) { BatchImportRoll * self; #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT_ROLL, BatchImportRoll); @@ -4005,7 +3975,7 @@ static void batch_import_roll_finalize (BatchImportRoll* obj) { g_signal_handlers_destroy (self); #line 265 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_collection_unref0 (self->generated_events); -#line 4009 "BatchImport.c" +#line 3979 "BatchImport.c" } @@ -4024,18 +3994,18 @@ GType batch_import_roll_get_type (void) { gpointer batch_import_roll_ref (gpointer instance) { - BatchImportRoll* self; + BatchImportRoll * self; self = instance; #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" g_atomic_int_inc (&self->ref_count); #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" return instance; -#line 4034 "BatchImport.c" +#line 4004 "BatchImport.c" } void batch_import_roll_unref (gpointer instance) { - BatchImportRoll* self; + BatchImportRoll * self; self = instance; #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -4043,24 +4013,24 @@ void batch_import_roll_unref (gpointer instance) { BATCH_IMPORT_ROLL_GET_CLASS (self)->finalize (self); #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4047 "BatchImport.c" +#line 4017 "BatchImport.c" } } BatchImportResult* batch_import_result_construct (GType object_type, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, DuplicatedFile* duplicate_of, ImportResult _result_) { BatchImportResult* self = NULL; - BatchImportJob* _tmp0_ = NULL; - BatchImportJob* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - DuplicatedFile* _tmp8_ = NULL; - DuplicatedFile* _tmp9_ = NULL; - ImportResult _tmp10_ = 0; + BatchImportJob* _tmp0_; + BatchImportJob* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + DuplicatedFile* _tmp8_; + DuplicatedFile* _tmp9_; + ImportResult _tmp10_; #line 287 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL); #line 287 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4119,33 +4089,33 @@ BatchImportResult* batch_import_result_construct (GType object_type, BatchImport self->result = _tmp10_; #line 287 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 4123 "BatchImport.c" +#line 4093 "BatchImport.c" } BatchImportResult* batch_import_result_new (BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, DuplicatedFile* duplicate_of, ImportResult _result_) { #line 287 "/home/jens/Source/shotwell/src/BatchImport.vala" return batch_import_result_construct (TYPE_BATCH_IMPORT_RESULT, job, file, src_identifier, dest_identifier, duplicate_of, _result_); -#line 4130 "BatchImport.c" +#line 4100 "BatchImport.c" } BatchImportResult* batch_import_result_construct_from_error (GType object_type, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result) { BatchImportResult* self = NULL; - BatchImportJob* _tmp0_ = NULL; - BatchImportJob* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GError* _tmp8_ = NULL; - ImportResult _tmp9_ = 0; - ImportResult _tmp10_ = 0; - GError* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; + BatchImportJob* _tmp0_; + BatchImportJob* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + GError* _tmp8_; + ImportResult _tmp9_; + ImportResult _tmp10_; + GError* _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; #line 297 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL); #line 297 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4208,21 +4178,21 @@ BatchImportResult* batch_import_result_construct_from_error (GType object_type, self->errmsg = _tmp13_; #line 297 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 4212 "BatchImport.c" +#line 4182 "BatchImport.c" } BatchImportResult* batch_import_result_new_from_error (BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result) { #line 297 "/home/jens/Source/shotwell/src/BatchImport.vala" return batch_import_result_construct_from_error (TYPE_BATCH_IMPORT_RESULT, job, file, src_identifier, dest_identifier, err, default_result); -#line 4219 "BatchImport.c" +#line 4189 "BatchImport.c" } static void value_batch_import_result_init (GValue* value) { #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 4226 "BatchImport.c" +#line 4196 "BatchImport.c" } @@ -4231,7 +4201,7 @@ static void value_batch_import_result_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_result_unref (value->data[0].v_pointer); -#line 4235 "BatchImport.c" +#line 4205 "BatchImport.c" } } @@ -4241,11 +4211,11 @@ static void value_batch_import_result_copy_value (const GValue* src_value, GValu if (src_value->data[0].v_pointer) { #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = batch_import_result_ref (src_value->data[0].v_pointer); -#line 4245 "BatchImport.c" +#line 4215 "BatchImport.c" } else { #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = NULL; -#line 4249 "BatchImport.c" +#line 4219 "BatchImport.c" } } @@ -4253,66 +4223,66 @@ static void value_batch_import_result_copy_value (const GValue* src_value, GValu static gpointer value_batch_import_result_peek_pointer (const GValue* value) { #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 4257 "BatchImport.c" +#line 4227 "BatchImport.c" } static gchar* value_batch_import_result_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" if (collect_values[0].v_pointer) { -#line 4264 "BatchImport.c" - BatchImportResult* object; +#line 4234 "BatchImport.c" + BatchImportResult * object; object = collect_values[0].v_pointer; #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" if (object->parent_instance.g_class == NULL) { #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4271 "BatchImport.c" +#line 4241 "BatchImport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4275 "BatchImport.c" +#line 4245 "BatchImport.c" } #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = batch_import_result_ref (object); -#line 4279 "BatchImport.c" +#line 4249 "BatchImport.c" } else { #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 4283 "BatchImport.c" +#line 4253 "BatchImport.c" } #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 4287 "BatchImport.c" +#line 4257 "BatchImport.c" } static gchar* value_batch_import_result_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - BatchImportResult** object_p; + BatchImportResult ** object_p; object_p = collect_values[0].v_pointer; #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!object_p) { #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 4298 "BatchImport.c" +#line 4268 "BatchImport.c" } #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!value->data[0].v_pointer) { #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = NULL; -#line 4304 "BatchImport.c" +#line 4274 "BatchImport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = value->data[0].v_pointer; -#line 4308 "BatchImport.c" +#line 4278 "BatchImport.c" } else { #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = batch_import_result_ref (value->data[0].v_pointer); -#line 4312 "BatchImport.c" +#line 4282 "BatchImport.c" } #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 4316 "BatchImport.c" +#line 4286 "BatchImport.c" } @@ -4326,7 +4296,7 @@ GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" return G_PARAM_SPEC (spec); -#line 4330 "BatchImport.c" +#line 4300 "BatchImport.c" } @@ -4335,12 +4305,12 @@ gpointer value_get_batch_import_result (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_RESULT), NULL); #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 4339 "BatchImport.c" +#line 4309 "BatchImport.c" } void value_set_batch_import_result (GValue* value, gpointer v_object) { - BatchImportResult* old; + BatchImportResult * old; #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_RESULT)); #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4355,23 +4325,23 @@ void value_set_batch_import_result (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_result_ref (value->data[0].v_pointer); -#line 4359 "BatchImport.c" +#line 4329 "BatchImport.c" } else { #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 4363 "BatchImport.c" +#line 4333 "BatchImport.c" } #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_result_unref (old); -#line 4369 "BatchImport.c" +#line 4339 "BatchImport.c" } } void value_take_batch_import_result (GValue* value, gpointer v_object) { - BatchImportResult* old; + BatchImportResult * old; #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_RESULT)); #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4384,17 +4354,17 @@ void value_take_batch_import_result (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 4388 "BatchImport.c" +#line 4358 "BatchImport.c" } else { #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 4392 "BatchImport.c" +#line 4362 "BatchImport.c" } #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_result_unref (old); -#line 4398 "BatchImport.c" +#line 4368 "BatchImport.c" } } @@ -4404,7 +4374,7 @@ static void batch_import_result_class_init (BatchImportResultClass * klass) { batch_import_result_parent_class = g_type_class_peek_parent (klass); #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" ((BatchImportResultClass *) klass)->finalize = batch_import_result_finalize; -#line 4408 "BatchImport.c" +#line 4378 "BatchImport.c" } @@ -4413,11 +4383,11 @@ static void batch_import_result_instance_init (BatchImportResult * self) { self->errmsg = NULL; #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ref_count = 1; -#line 4417 "BatchImport.c" +#line 4387 "BatchImport.c" } -static void batch_import_result_finalize (BatchImportResult* obj) { +static void batch_import_result_finalize (BatchImportResult * obj) { BatchImportResult * self; #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT_RESULT, BatchImportResult); @@ -4435,7 +4405,7 @@ static void batch_import_result_finalize (BatchImportResult* obj) { _g_free0 (self->errmsg); #line 285 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->duplicate_of); -#line 4439 "BatchImport.c" +#line 4409 "BatchImport.c" } @@ -4454,18 +4424,18 @@ GType batch_import_result_get_type (void) { gpointer batch_import_result_ref (gpointer instance) { - BatchImportResult* self; + BatchImportResult * self; self = instance; #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" g_atomic_int_inc (&self->ref_count); #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" return instance; -#line 4464 "BatchImport.c" +#line 4434 "BatchImport.c" } void batch_import_result_unref (gpointer instance) { - BatchImportResult* self; + BatchImportResult * self; self = instance; #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -4473,15 +4443,15 @@ void batch_import_result_unref (gpointer instance) { BATCH_IMPORT_RESULT_GET_CLASS (self)->finalize (self); #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4477 "BatchImport.c" +#line 4447 "BatchImport.c" } } ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed, GeeList* pre_already_imported) { ImportManifest* self = NULL; - GeeList* _tmp0_ = NULL; - GeeList* _tmp22_ = NULL; + GeeList* _tmp0_; + GeeList* _tmp22_; #line 321 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail ((prefailed == NULL) || GEE_IS_LIST (prefailed), NULL); #line 321 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4492,15 +4462,15 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed _tmp0_ = prefailed; #line 323 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp0_ != NULL) { -#line 4496 "BatchImport.c" +#line 4466 "BatchImport.c" { GeeList* _job_list = NULL; - GeeList* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; + GeeList* _tmp1_; + GeeList* _tmp2_; gint _job_size = 0; - GeeList* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + GeeList* _tmp3_; + gint _tmp4_; + gint _tmp5_; gint _job_index = 0; #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = prefailed; @@ -4520,25 +4490,25 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed _job_index = -1; #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 4524 "BatchImport.c" - gint _tmp6_ = 0; - gint _tmp7_ = 0; - gint _tmp8_ = 0; +#line 4494 "BatchImport.c" + gint _tmp6_; + gint _tmp7_; + gint _tmp8_; BatchImportJob* job = NULL; - GeeList* _tmp9_ = NULL; - gint _tmp10_ = 0; - gpointer _tmp11_ = NULL; + GeeList* _tmp9_; + gint _tmp10_; + gpointer _tmp11_; BatchImportResult* batch_result = NULL; - BatchImportJob* _tmp12_ = NULL; - BatchImportJob* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - BatchImportJob* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - BatchImportResult* _tmp19_ = NULL; - BatchImportResult* _tmp20_ = NULL; - BatchImportResult* _tmp21_ = NULL; + BatchImportJob* _tmp12_; + BatchImportJob* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + BatchImportJob* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + BatchImportResult* _tmp19_; + BatchImportResult* _tmp20_; + BatchImportResult* _tmp21_; #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = _job_index; #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4551,7 +4521,7 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed if (!(_tmp7_ < _tmp8_)) { #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4555 "BatchImport.c" +#line 4525 "BatchImport.c" } #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = _job_list; @@ -4593,26 +4563,26 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed _batch_import_result_unref0 (batch_result); #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (job); -#line 4597 "BatchImport.c" +#line 4567 "BatchImport.c" } #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_job_list); -#line 4601 "BatchImport.c" +#line 4571 "BatchImport.c" } } #line 333 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp22_ = pre_already_imported; #line 333 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp22_ != NULL) { -#line 4608 "BatchImport.c" +#line 4578 "BatchImport.c" { GeeList* _job_list = NULL; - GeeList* _tmp23_ = NULL; - GeeList* _tmp24_ = NULL; + GeeList* _tmp23_; + GeeList* _tmp24_; gint _job_size = 0; - GeeList* _tmp25_ = NULL; - gint _tmp26_ = 0; - gint _tmp27_ = 0; + GeeList* _tmp25_; + gint _tmp26_; + gint _tmp27_; gint _job_index = 0; #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp23_ = pre_already_imported; @@ -4632,33 +4602,33 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed _job_index = -1; #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 4636 "BatchImport.c" - gint _tmp28_ = 0; - gint _tmp29_ = 0; - gint _tmp30_ = 0; +#line 4606 "BatchImport.c" + gint _tmp28_; + gint _tmp29_; + gint _tmp30_; BatchImportJob* job = NULL; - GeeList* _tmp31_ = NULL; - gint _tmp32_ = 0; - gpointer _tmp33_ = NULL; + GeeList* _tmp31_; + gint _tmp32_; + gpointer _tmp33_; BatchImportResult* batch_result = NULL; - BatchImportJob* _tmp34_ = NULL; - BatchImportJob* _tmp35_ = NULL; - gchar* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; - GFile* _tmp38_ = NULL; - GFile* _tmp39_ = NULL; - BatchImportJob* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; - BatchImportJob* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - BatchImportJob* _tmp46_ = NULL; - DuplicatedFile* _tmp47_ = NULL; - DuplicatedFile* _tmp48_ = NULL; - BatchImportResult* _tmp49_ = NULL; - BatchImportResult* _tmp50_ = NULL; - BatchImportResult* _tmp51_ = NULL; + BatchImportJob* _tmp34_; + BatchImportJob* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_; + GFile* _tmp38_; + GFile* _tmp39_; + BatchImportJob* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; + BatchImportJob* _tmp43_; + gchar* _tmp44_; + gchar* _tmp45_; + BatchImportJob* _tmp46_; + DuplicatedFile* _tmp47_; + DuplicatedFile* _tmp48_; + BatchImportResult* _tmp49_; + BatchImportResult* _tmp50_; + BatchImportResult* _tmp51_; #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp28_ = _job_index; #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4671,7 +4641,7 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed if (!(_tmp29_ < _tmp30_)) { #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4675 "BatchImport.c" +#line 4645 "BatchImport.c" } #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp31_ = _job_list; @@ -4735,31 +4705,31 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed _batch_import_result_unref0 (batch_result); #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (job); -#line 4739 "BatchImport.c" +#line 4709 "BatchImport.c" } #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_job_list); -#line 4743 "BatchImport.c" +#line 4713 "BatchImport.c" } } #line 321 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 4748 "BatchImport.c" +#line 4718 "BatchImport.c" } ImportManifest* import_manifest_new (GeeList* prefailed, GeeList* pre_already_imported) { #line 321 "/home/jens/Source/shotwell/src/BatchImport.vala" return import_manifest_construct (TYPE_IMPORT_MANIFEST, prefailed, pre_already_imported); -#line 4755 "BatchImport.c" +#line 4725 "BatchImport.c" } void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_result) { gboolean reported = FALSE; - BatchImportResult* _tmp0_ = NULL; - ImportResult _tmp1_ = 0; - gboolean _tmp26_ = FALSE; + BatchImportResult* _tmp0_; + ImportResult _tmp1_; + gboolean _tmp26_; #line 345 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_IMPORT_MANIFEST (self)); #line 345 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4774,10 +4744,10 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_ switch (_tmp1_) { #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_SUCCESS: -#line 4778 "BatchImport.c" +#line 4748 "BatchImport.c" { - GeeList* _tmp2_ = NULL; - BatchImportResult* _tmp3_ = NULL; + GeeList* _tmp2_; + BatchImportResult* _tmp3_; #line 349 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = self->success; #line 349 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4786,25 +4756,25 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp3_); #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4790 "BatchImport.c" +#line 4760 "BatchImport.c" } #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_USER_ABORT: -#line 4794 "BatchImport.c" +#line 4764 "BatchImport.c" { gboolean _tmp4_ = FALSE; - BatchImportResult* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; + BatchImportResult* _tmp5_; + GFile* _tmp6_; #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = batch_result; #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = _tmp5_->file; #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp6_ != NULL) { -#line 4805 "BatchImport.c" - BatchImportResult* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; +#line 4775 "BatchImport.c" + BatchImportResult* _tmp7_; + GFile* _tmp8_; + gboolean _tmp9_; #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = batch_result; #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4813,39 +4783,39 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_ _tmp9_ = query_is_directory (_tmp8_); #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = !_tmp9_; -#line 4817 "BatchImport.c" +#line 4787 "BatchImport.c" } else { #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = FALSE; -#line 4821 "BatchImport.c" +#line 4791 "BatchImport.c" } #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp4_) { -#line 4825 "BatchImport.c" - GeeList* _tmp10_ = NULL; - BatchImportResult* _tmp11_ = NULL; +#line 4795 "BatchImport.c" + GeeList* _tmp10_; + BatchImportResult* _tmp11_; #line 354 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = self->aborted; #line 354 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = batch_result; #line 354 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_); -#line 4834 "BatchImport.c" +#line 4804 "BatchImport.c" } else { #line 356 "/home/jens/Source/shotwell/src/BatchImport.vala" reported = FALSE; -#line 4838 "BatchImport.c" +#line 4808 "BatchImport.c" } #line 357 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4842 "BatchImport.c" +#line 4812 "BatchImport.c" } #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_UNSUPPORTED_FORMAT: -#line 4846 "BatchImport.c" +#line 4816 "BatchImport.c" { - GeeList* _tmp12_ = NULL; - BatchImportResult* _tmp13_ = NULL; + GeeList* _tmp12_; + BatchImportResult* _tmp13_; #line 360 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = self->skipped_photos; #line 360 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4854,16 +4824,16 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_); #line 361 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4858 "BatchImport.c" +#line 4828 "BatchImport.c" } #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_NOT_A_FILE: #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_NOT_AN_IMAGE: -#line 4864 "BatchImport.c" +#line 4834 "BatchImport.c" { - GeeList* _tmp14_ = NULL; - BatchImportResult* _tmp15_ = NULL; + GeeList* _tmp14_; + BatchImportResult* _tmp15_; #line 365 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = self->skipped_files; #line 365 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4872,14 +4842,14 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_); #line 366 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4876 "BatchImport.c" +#line 4846 "BatchImport.c" } #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_PHOTO_EXISTS: -#line 4880 "BatchImport.c" +#line 4850 "BatchImport.c" { - GeeList* _tmp16_ = NULL; - BatchImportResult* _tmp17_ = NULL; + GeeList* _tmp16_; + BatchImportResult* _tmp17_; #line 369 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp16_ = self->already_imported; #line 369 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4888,14 +4858,14 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_); #line 370 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4892 "BatchImport.c" +#line 4862 "BatchImport.c" } #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_CAMERA_ERROR: -#line 4896 "BatchImport.c" +#line 4866 "BatchImport.c" { - GeeList* _tmp18_ = NULL; - BatchImportResult* _tmp19_ = NULL; + GeeList* _tmp18_; + BatchImportResult* _tmp19_; #line 373 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp18_ = self->camera_failed; #line 373 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4904,14 +4874,14 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_); #line 374 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4908 "BatchImport.c" +#line 4878 "BatchImport.c" } #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_FILE_WRITE_ERROR: -#line 4912 "BatchImport.c" +#line 4882 "BatchImport.c" { - GeeList* _tmp20_ = NULL; - BatchImportResult* _tmp21_ = NULL; + GeeList* _tmp20_; + BatchImportResult* _tmp21_; #line 377 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp20_ = self->write_failed; #line 377 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4920,14 +4890,14 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_); #line 378 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4924 "BatchImport.c" +#line 4894 "BatchImport.c" } #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala" case IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE: -#line 4928 "BatchImport.c" +#line 4898 "BatchImport.c" { - GeeList* _tmp22_ = NULL; - BatchImportResult* _tmp23_ = NULL; + GeeList* _tmp22_; + BatchImportResult* _tmp23_; #line 381 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp22_ = self->corrupt_files; #line 381 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4936,12 +4906,12 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_); #line 382 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4940 "BatchImport.c" +#line 4910 "BatchImport.c" } default: { - GeeList* _tmp24_ = NULL; - BatchImportResult* _tmp25_ = NULL; + GeeList* _tmp24_; + BatchImportResult* _tmp25_; #line 385 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp24_ = self->failed; #line 385 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -4950,23 +4920,23 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_); #line 386 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 4954 "BatchImport.c" +#line 4924 "BatchImport.c" } } #line 389 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp26_ = reported; #line 389 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp26_) { -#line 4961 "BatchImport.c" - GeeList* _tmp27_ = NULL; - BatchImportResult* _tmp28_ = NULL; +#line 4931 "BatchImport.c" + GeeList* _tmp27_; + BatchImportResult* _tmp28_; #line 390 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp27_ = self->all; #line 390 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp28_ = batch_result; #line 390 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_); -#line 4970 "BatchImport.c" +#line 4940 "BatchImport.c" } } @@ -4974,7 +4944,7 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_ static void value_import_manifest_init (GValue* value) { #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 4978 "BatchImport.c" +#line 4948 "BatchImport.c" } @@ -4983,7 +4953,7 @@ static void value_import_manifest_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" import_manifest_unref (value->data[0].v_pointer); -#line 4987 "BatchImport.c" +#line 4957 "BatchImport.c" } } @@ -4993,11 +4963,11 @@ static void value_import_manifest_copy_value (const GValue* src_value, GValue* d if (src_value->data[0].v_pointer) { #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = import_manifest_ref (src_value->data[0].v_pointer); -#line 4997 "BatchImport.c" +#line 4967 "BatchImport.c" } else { #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = NULL; -#line 5001 "BatchImport.c" +#line 4971 "BatchImport.c" } } @@ -5005,66 +4975,66 @@ static void value_import_manifest_copy_value (const GValue* src_value, GValue* d static gpointer value_import_manifest_peek_pointer (const GValue* value) { #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 5009 "BatchImport.c" +#line 4979 "BatchImport.c" } static gchar* value_import_manifest_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" if (collect_values[0].v_pointer) { -#line 5016 "BatchImport.c" - ImportManifest* object; +#line 4986 "BatchImport.c" + ImportManifest * object; object = collect_values[0].v_pointer; #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" if (object->parent_instance.g_class == NULL) { #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 5023 "BatchImport.c" +#line 4993 "BatchImport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 5027 "BatchImport.c" +#line 4997 "BatchImport.c" } #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = import_manifest_ref (object); -#line 5031 "BatchImport.c" +#line 5001 "BatchImport.c" } else { #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 5035 "BatchImport.c" +#line 5005 "BatchImport.c" } #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 5039 "BatchImport.c" +#line 5009 "BatchImport.c" } static gchar* value_import_manifest_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - ImportManifest** object_p; + ImportManifest ** object_p; object_p = collect_values[0].v_pointer; #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!object_p) { #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 5050 "BatchImport.c" +#line 5020 "BatchImport.c" } #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!value->data[0].v_pointer) { #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = NULL; -#line 5056 "BatchImport.c" +#line 5026 "BatchImport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = value->data[0].v_pointer; -#line 5060 "BatchImport.c" +#line 5030 "BatchImport.c" } else { #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = import_manifest_ref (value->data[0].v_pointer); -#line 5064 "BatchImport.c" +#line 5034 "BatchImport.c" } #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 5068 "BatchImport.c" +#line 5038 "BatchImport.c" } @@ -5078,7 +5048,7 @@ GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, co G_PARAM_SPEC (spec)->value_type = object_type; #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" return G_PARAM_SPEC (spec); -#line 5082 "BatchImport.c" +#line 5052 "BatchImport.c" } @@ -5087,12 +5057,12 @@ gpointer value_get_import_manifest (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORT_MANIFEST), NULL); #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 5091 "BatchImport.c" +#line 5061 "BatchImport.c" } void value_set_import_manifest (GValue* value, gpointer v_object) { - ImportManifest* old; + ImportManifest * old; #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORT_MANIFEST)); #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5107,23 +5077,23 @@ void value_set_import_manifest (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" import_manifest_ref (value->data[0].v_pointer); -#line 5111 "BatchImport.c" +#line 5081 "BatchImport.c" } else { #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 5115 "BatchImport.c" +#line 5085 "BatchImport.c" } #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" import_manifest_unref (old); -#line 5121 "BatchImport.c" +#line 5091 "BatchImport.c" } } void value_take_import_manifest (GValue* value, gpointer v_object) { - ImportManifest* old; + ImportManifest * old; #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORT_MANIFEST)); #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5136,17 +5106,17 @@ void value_take_import_manifest (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 5140 "BatchImport.c" +#line 5110 "BatchImport.c" } else { #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 5144 "BatchImport.c" +#line 5114 "BatchImport.c" } #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" import_manifest_unref (old); -#line 5150 "BatchImport.c" +#line 5120 "BatchImport.c" } } @@ -5156,22 +5126,22 @@ static void import_manifest_class_init (ImportManifestClass * klass) { import_manifest_parent_class = g_type_class_peek_parent (klass); #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" ((ImportManifestClass *) klass)->finalize = import_manifest_finalize; -#line 5160 "BatchImport.c" +#line 5130 "BatchImport.c" } static void import_manifest_instance_init (ImportManifest * self) { - GeeArrayList* _tmp0_ = NULL; - GeeArrayList* _tmp1_ = NULL; - GeeArrayList* _tmp2_ = NULL; - GeeArrayList* _tmp3_ = NULL; - GeeArrayList* _tmp4_ = NULL; - GeeArrayList* _tmp5_ = NULL; - GeeArrayList* _tmp6_ = NULL; - GeeArrayList* _tmp7_ = NULL; - GeeArrayList* _tmp8_ = NULL; - GeeArrayList* _tmp9_ = NULL; - GeeArrayList* _tmp10_ = NULL; + GeeArrayList* _tmp0_; + GeeArrayList* _tmp1_; + GeeArrayList* _tmp2_; + GeeArrayList* _tmp3_; + GeeArrayList* _tmp4_; + GeeArrayList* _tmp5_; + GeeArrayList* _tmp6_; + GeeArrayList* _tmp7_; + GeeArrayList* _tmp8_; + GeeArrayList* _tmp9_; + GeeArrayList* _tmp10_; #line 309 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 309 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5218,11 +5188,11 @@ static void import_manifest_instance_init (ImportManifest * self) { self->all = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_LIST, GeeList); #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ref_count = 1; -#line 5222 "BatchImport.c" +#line 5192 "BatchImport.c" } -static void import_manifest_finalize (ImportManifest* obj) { +static void import_manifest_finalize (ImportManifest * obj) { ImportManifest * self; #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_MANIFEST, ImportManifest); @@ -5250,7 +5220,7 @@ static void import_manifest_finalize (ImportManifest* obj) { _g_object_unref0 (self->corrupt_files); #line 319 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->all); -#line 5254 "BatchImport.c" +#line 5224 "BatchImport.c" } @@ -5269,18 +5239,18 @@ GType import_manifest_get_type (void) { gpointer import_manifest_ref (gpointer instance) { - ImportManifest* self; + ImportManifest * self; self = instance; #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" g_atomic_int_inc (&self->ref_count); #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" return instance; -#line 5279 "BatchImport.c" +#line 5249 "BatchImport.c" } void import_manifest_unref (gpointer instance) { - ImportManifest* self; + ImportManifest * self; self = instance; #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -5288,7 +5258,7 @@ void import_manifest_unref (gpointer instance) { IMPORT_MANIFEST_GET_CLASS (self)->finalize (self); #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 5292 "BatchImport.c" +#line 5262 "BatchImport.c" } } @@ -5296,14 +5266,14 @@ void import_manifest_unref (gpointer instance) { static void _batch_import_user_halt_application_exiting (Application* _sender, gboolean panicked, gpointer self) { #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_user_halt ((BatchImport*) self); -#line 5300 "BatchImport.c" +#line 5270 "BatchImport.c" } static gpointer _batch_import_roll_ref0 (gpointer self) { #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? batch_import_roll_ref (self) : NULL; -#line 5307 "BatchImport.c" +#line 5277 "BatchImport.c" } @@ -5312,7 +5282,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { result = file_hash ((GFile*) v); #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 5316 "BatchImport.c" +#line 5286 "BatchImport.c" } @@ -5321,7 +5291,7 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer result = file_equal ((GFile*) a, (GFile*) b); #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 5325 "BatchImport.c" +#line 5295 "BatchImport.c" } @@ -5330,30 +5300,30 @@ static gboolean _batch_import_display_imported_timer_gsource_func (gpointer self result = batch_import_display_imported_timer ((BatchImport*) self); #line 501 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 5334 "BatchImport.c" +#line 5304 "BatchImport.c" } BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest) { BatchImport * self = NULL; - GeeIterable* _tmp0_ = NULL; - GeeIterable* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - BatchImportImportReporter _tmp4_ = NULL; - void* _tmp4__target = NULL; - GeeArrayList* _tmp5_ = NULL; - GeeArrayList* _tmp6_ = NULL; - ImportManifest* _tmp7_ = NULL; + GeeIterable* _tmp0_; + GeeIterable* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; + BatchImportImportReporter _tmp4_; + void* _tmp4__target; + GeeArrayList* _tmp5_; + GeeArrayList* _tmp6_; + ImportManifest* _tmp7_; GCancellable* _tmp8_ = NULL; - GCancellable* _tmp9_ = NULL; - GCancellable* _tmp13_ = NULL; + GCancellable* _tmp9_; + GCancellable* _tmp13_; BatchImportRoll* _tmp14_ = NULL; - BatchImportRoll* _tmp15_ = NULL; - BatchImportRoll* _tmp19_ = NULL; - ImportManifest* _tmp20_ = NULL; - Application* _tmp38_ = NULL; - Application* _tmp39_ = NULL; + BatchImportRoll* _tmp15_; + BatchImportRoll* _tmp19_; + ImportManifest* _tmp20_; + Application* _tmp38_; + Application* _tmp39_; #line 478 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (GEE_IS_ITERABLE (jobs), NULL); #line 478 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5408,9 +5378,9 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const _tmp9_ = cancellable; #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp9_ != NULL) { -#line 5412 "BatchImport.c" - GCancellable* _tmp10_ = NULL; - GCancellable* _tmp11_ = NULL; +#line 5382 "BatchImport.c" + GCancellable* _tmp10_; + GCancellable* _tmp11_; #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = cancellable; #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5419,16 +5389,16 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const _g_object_unref0 (_tmp8_); #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = _tmp11_; -#line 5423 "BatchImport.c" +#line 5393 "BatchImport.c" } else { - GCancellable* _tmp12_ = NULL; + GCancellable* _tmp12_; #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = g_cancellable_new (); #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp8_); #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = _tmp12_; -#line 5432 "BatchImport.c" +#line 5402 "BatchImport.c" } #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = _g_object_ref0 (_tmp8_); @@ -5440,9 +5410,9 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const _tmp15_ = import_roll; #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp15_ != NULL) { -#line 5444 "BatchImport.c" - BatchImportRoll* _tmp16_ = NULL; - BatchImportRoll* _tmp17_ = NULL; +#line 5414 "BatchImport.c" + BatchImportRoll* _tmp16_; + BatchImportRoll* _tmp17_; #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp16_ = import_roll; #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5451,16 +5421,16 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const _batch_import_roll_unref0 (_tmp14_); #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = _tmp17_; -#line 5455 "BatchImport.c" +#line 5425 "BatchImport.c" } else { - BatchImportRoll* _tmp18_ = NULL; + BatchImportRoll* _tmp18_; #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp18_ = batch_import_roll_new (); #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_roll_unref0 (_tmp14_); #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = _tmp18_; -#line 5464 "BatchImport.c" +#line 5434 "BatchImport.c" } #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp19_ = _batch_import_roll_ref0 (_tmp14_); @@ -5472,24 +5442,24 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const _tmp20_ = skip_manifest; #line 490 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp20_ != NULL) { -#line 5476 "BatchImport.c" - GeeHashSet* _tmp21_ = NULL; +#line 5446 "BatchImport.c" + GeeHashSet* _tmp21_; #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp21_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->skipset); #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->skipset = _tmp21_; -#line 5484 "BatchImport.c" +#line 5454 "BatchImport.c" { GeeList* _source_list = NULL; - ImportManifest* _tmp22_ = NULL; - GeeList* _tmp23_ = NULL; - GeeList* _tmp24_ = NULL; + ImportManifest* _tmp22_; + GeeList* _tmp23_; + GeeList* _tmp24_; gint _source_size = 0; - GeeList* _tmp25_ = NULL; - gint _tmp26_ = 0; - gint _tmp27_ = 0; + GeeList* _tmp25_; + gint _tmp26_; + gint _tmp27_; gint _source_index = 0; #line 492 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp22_ = skip_manifest; @@ -5511,18 +5481,18 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const _source_index = -1; #line 492 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 5515 "BatchImport.c" - gint _tmp28_ = 0; - gint _tmp29_ = 0; - gint _tmp30_ = 0; +#line 5485 "BatchImport.c" + gint _tmp28_; + gint _tmp29_; + gint _tmp30_; MediaSource* source = NULL; - GeeList* _tmp31_ = NULL; - gint _tmp32_ = 0; - gpointer _tmp33_ = NULL; - GeeHashSet* _tmp34_ = NULL; - MediaSource* _tmp35_ = NULL; - GFile* _tmp36_ = NULL; - GFile* _tmp37_ = NULL; + GeeList* _tmp31_; + gint _tmp32_; + gpointer _tmp33_; + GeeHashSet* _tmp34_; + MediaSource* _tmp35_; + GFile* _tmp36_; + GFile* _tmp37_; #line 492 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp28_ = _source_index; #line 492 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5535,7 +5505,7 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const if (!(_tmp29_ < _tmp30_)) { #line 492 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 5539 "BatchImport.c" +#line 5509 "BatchImport.c" } #line 492 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp31_ = _source_list; @@ -5559,11 +5529,11 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const _g_object_unref0 (_tmp37_); #line 492 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (source); -#line 5563 "BatchImport.c" +#line 5533 "BatchImport.c" } #line 492 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_source_list); -#line 5567 "BatchImport.c" +#line 5537 "BatchImport.c" } } #line 498 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5582,21 +5552,21 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const _g_object_unref0 (_tmp8_); #line 478 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 5586 "BatchImport.c" +#line 5556 "BatchImport.c" } BatchImport* batch_import_new (GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest) { #line 478 "/home/jens/Source/shotwell/src/BatchImport.vala" return batch_import_construct (TYPE_BATCH_IMPORT, jobs, name, reporter, reporter_target, prefailed, pre_already_imported, cancellable, import_roll, skip_manifest); -#line 5593 "BatchImport.c" +#line 5563 "BatchImport.c" } gchar* batch_import_get_name (BatchImport* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 511 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (self), NULL); #line 512 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5607,25 +5577,25 @@ gchar* batch_import_get_name (BatchImport* self) { result = _tmp1_; #line 512 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 5611 "BatchImport.c" +#line 5581 "BatchImport.c" } void batch_import_user_halt (BatchImport* self) { - GCancellable* _tmp0_ = NULL; + GCancellable* _tmp0_; #line 515 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 516 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = self->priv->cancellable; #line 516 "/home/jens/Source/shotwell/src/BatchImport.vala" g_cancellable_cancel (_tmp0_); -#line 5623 "BatchImport.c" +#line 5593 "BatchImport.c" } gboolean batch_import_get_untrash_duplicates (BatchImport* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 519 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE); #line 520 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5634,25 +5604,25 @@ gboolean batch_import_get_untrash_duplicates (BatchImport* self) { result = _tmp0_; #line 520 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 5638 "BatchImport.c" +#line 5608 "BatchImport.c" } void batch_import_set_untrash_duplicates (BatchImport* self, gboolean untrash_duplicates) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 523 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 524 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = untrash_duplicates; #line 524 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->untrash_duplicates = _tmp0_; -#line 5650 "BatchImport.c" +#line 5620 "BatchImport.c" } gboolean batch_import_get_mark_duplicates_online (BatchImport* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 527 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE); #line 528 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5661,19 +5631,19 @@ gboolean batch_import_get_mark_duplicates_online (BatchImport* self) { result = _tmp0_; #line 528 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 5665 "BatchImport.c" +#line 5635 "BatchImport.c" } void batch_import_set_mark_duplicates_online (BatchImport* self, gboolean mark_duplicates_online) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 531 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 532 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = mark_duplicates_online; #line 532 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->mark_duplicates_online = _tmp0_; -#line 5677 "BatchImport.c" +#line 5647 "BatchImport.c" } @@ -5682,21 +5652,21 @@ static void batch_import_log_status (BatchImport* self, const gchar* where) { g_return_if_fail (IS_BATCH_IMPORT (self)); #line 535 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (where != NULL); -#line 5686 "BatchImport.c" +#line 5656 "BatchImport.c" } static gboolean batch_import_report_failure (BatchImport* self, BatchImportResult* import_result) { gboolean result = FALSE; gboolean proceed = FALSE; - ImportManifest* _tmp0_ = NULL; - BatchImportResult* _tmp1_ = NULL; - BatchImportResult* _tmp2_ = NULL; - ImportResult _tmp3_ = 0; + ImportManifest* _tmp0_; + BatchImportResult* _tmp1_; + BatchImportResult* _tmp2_; + ImportResult _tmp3_; gboolean _tmp23_ = FALSE; - BatchImportResult* _tmp24_ = NULL; - ImportResult _tmp25_ = 0; - gboolean _tmp26_ = FALSE; + BatchImportResult* _tmp24_; + ImportResult _tmp25_; + gboolean _tmp26_; GError * _inner_error_ = NULL; #line 545 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE); @@ -5716,25 +5686,25 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul _tmp3_ = _tmp2_->result; #line 550 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp3_ != IMPORT_RESULT_SUCCESS) { -#line 5720 "BatchImport.c" - BatchImportResult* _tmp4_ = NULL; +#line 5690 "BatchImport.c" + BatchImportResult* _tmp4_; gboolean _tmp5_ = FALSE; - BatchImportResult* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; + BatchImportResult* _tmp6_; + GFile* _tmp7_; #line 551 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = import_result; #line 551 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_emit_by_name (self, "import-job-failed", _tmp4_); + g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORT_JOB_FAILED_SIGNAL], 0, _tmp4_); #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = import_result; #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = _tmp6_->file; #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp7_ != NULL) { -#line 5735 "BatchImport.c" - BatchImportResult* _tmp8_ = NULL; - ImportResult _tmp9_ = 0; - gboolean _tmp10_ = FALSE; +#line 5705 "BatchImport.c" + BatchImportResult* _tmp8_; + ImportResult _tmp9_; + gboolean _tmp10_; #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = import_result; #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5743,25 +5713,25 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul _tmp10_ = import_result_is_abort (_tmp9_); #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = !_tmp10_; -#line 5747 "BatchImport.c" +#line 5717 "BatchImport.c" } else { #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = FALSE; -#line 5751 "BatchImport.c" +#line 5721 "BatchImport.c" } #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp5_) { -#line 5755 "BatchImport.c" +#line 5725 "BatchImport.c" guint64 filesize = 0ULL; - guint64 _tmp22_ = 0ULL; + guint64 _tmp22_; #line 554 "/home/jens/Source/shotwell/src/BatchImport.vala" filesize = (guint64) 0; -#line 5760 "BatchImport.c" +#line 5730 "BatchImport.c" { guint64 _tmp11_ = 0ULL; - BatchImportResult* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - guint64 _tmp14_ = 0ULL; + BatchImportResult* _tmp12_; + GFile* _tmp13_; + guint64 _tmp14_; #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = import_result; #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5772,23 +5742,23 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul _tmp11_ = _tmp14_; #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5776 "BatchImport.c" - goto __catch410_g_error; +#line 5746 "BatchImport.c" + goto __catch411_g_error; } #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala" filesize = _tmp11_; -#line 5781 "BatchImport.c" +#line 5751 "BatchImport.c" } - goto __finally410; - __catch410_g_error: + goto __finally411; + __catch411_g_error: { GError* err = NULL; - BatchImportResult* _tmp15_ = NULL; - GFile* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - GError* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; + BatchImportResult* _tmp15_; + GFile* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + GError* _tmp19_; + const gchar* _tmp20_; #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5811,12 +5781,12 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul _g_free0 (_tmp18_); #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 5815 "BatchImport.c" +#line 5785 "BatchImport.c" } - __finally410: + __finally411: #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5820 "BatchImport.c" +#line 5790 "BatchImport.c" gboolean _tmp21_ = FALSE; #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5824,13 +5794,13 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul g_clear_error (&_inner_error_); #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala" return _tmp21_; -#line 5828 "BatchImport.c" +#line 5798 "BatchImport.c" } #line 563 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp22_ = filesize; #line 563 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_report_progress (self, _tmp22_); -#line 5834 "BatchImport.c" +#line 5804 "BatchImport.c" } } #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5841,25 +5811,25 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul _tmp26_ = import_result_is_nonuser_abort (_tmp25_); #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp26_) { -#line 5845 "BatchImport.c" - gboolean _tmp27_ = FALSE; +#line 5815 "BatchImport.c" + gboolean _tmp27_; #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp27_ = proceed; #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp23_ = _tmp27_; -#line 5851 "BatchImport.c" +#line 5821 "BatchImport.c" } else { #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp23_ = FALSE; -#line 5855 "BatchImport.c" +#line 5825 "BatchImport.c" } #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp23_) { -#line 5859 "BatchImport.c" - BatchImportResult* _tmp28_ = NULL; - ImportResult _tmp29_ = 0; - BatchImportResult* _tmp30_ = NULL; - const gchar* _tmp31_ = NULL; +#line 5829 "BatchImport.c" + BatchImportResult* _tmp28_; + ImportResult _tmp29_; + BatchImportResult* _tmp30_; + const gchar* _tmp31_; #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp28_ = import_result; #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5869,23 +5839,23 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp31_ = _tmp30_->errmsg; #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_emit_by_name (self, "fatal-error", _tmp29_, _tmp31_); + g_signal_emit (self, batch_import_signals[BATCH_IMPORT_FATAL_ERROR_SIGNAL], 0, _tmp29_, _tmp31_); #line 570 "/home/jens/Source/shotwell/src/BatchImport.vala" proceed = FALSE; -#line 5876 "BatchImport.c" +#line 5846 "BatchImport.c" } #line 573 "/home/jens/Source/shotwell/src/BatchImport.vala" result = proceed; #line 573 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 5882 "BatchImport.c" +#line 5852 "BatchImport.c" } static void batch_import_report_progress (BatchImport* self, guint64 increment_of_progress) { - guint64 _tmp0_ = 0ULL; - guint64 _tmp1_ = 0ULL; - guint64 _tmp2_ = 0ULL; + guint64 _tmp0_; + guint64 _tmp1_; + guint64 _tmp2_; #line 576 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 577 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5898,11 +5868,11 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o _tmp2_ = self->priv->completed_bytes; #line 581 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp2_ == ((guint64) 0)) { -#line 5902 "BatchImport.c" +#line 5872 "BatchImport.c" gulong now = 0UL; - gulong _tmp3_ = 0UL; - gulong _tmp4_ = 0UL; - gulong _tmp5_ = 0UL; + gulong _tmp3_; + gulong _tmp4_; + gulong _tmp5_; #line 582 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = now_ms (); #line 582 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5913,27 +5883,27 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o _tmp5_ = self->priv->last_preparing_ms; #line 583 "/home/jens/Source/shotwell/src/BatchImport.vala" if ((_tmp4_ - _tmp5_) > ((gulong) 250)) { -#line 5917 "BatchImport.c" - gulong _tmp6_ = 0UL; +#line 5887 "BatchImport.c" + gulong _tmp6_; #line 584 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = now; #line 584 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->last_preparing_ms = _tmp6_; #line 585 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_emit_by_name (self, "preparing"); -#line 5925 "BatchImport.c" + g_signal_emit (self, batch_import_signals[BATCH_IMPORT_PREPARING_SIGNAL], 0); +#line 5895 "BatchImport.c" } } else { - guint64 _tmp7_ = 0ULL; + guint64 _tmp7_; #line 587 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = increment_of_progress; #line 587 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp7_ > ((guint64) 0)) { -#line 5933 "BatchImport.c" +#line 5903 "BatchImport.c" gulong now = 0UL; - gulong _tmp8_ = 0UL; - gulong _tmp9_ = 0UL; - gulong _tmp10_ = 0UL; + gulong _tmp8_; + gulong _tmp9_; + gulong _tmp10_; #line 588 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = now_ms (); #line 588 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5944,10 +5914,10 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o _tmp10_ = self->priv->last_preparing_ms; #line 589 "/home/jens/Source/shotwell/src/BatchImport.vala" if ((_tmp9_ - _tmp10_) > ((gulong) 250)) { -#line 5948 "BatchImport.c" - gulong _tmp11_ = 0UL; - guint64 _tmp12_ = 0ULL; - guint64 _tmp13_ = 0ULL; +#line 5918 "BatchImport.c" + gulong _tmp11_; + guint64 _tmp12_; + guint64 _tmp13_; #line 590 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = now; #line 590 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -5957,8 +5927,8 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o #line 591 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = self->priv->total_bytes; #line 591 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_emit_by_name (self, "progress", _tmp12_, _tmp13_); -#line 5962 "BatchImport.c" + g_signal_emit (self, batch_import_signals[BATCH_IMPORT_PROGRESS_SIGNAL], 0, _tmp12_, _tmp13_); +#line 5932 "BatchImport.c" } } } @@ -5974,16 +5944,16 @@ static gboolean batch_import_report_failures (BatchImport* self, BackgroundImpor g_return_val_if_fail (IS_BACKGROUND_IMPORT_JOB (background_job), FALSE); #line 597 "/home/jens/Source/shotwell/src/BatchImport.vala" proceed = TRUE; -#line 5978 "BatchImport.c" +#line 5948 "BatchImport.c" { GeeList* _import_result_list = NULL; - BackgroundImportJob* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; + BackgroundImportJob* _tmp0_; + GeeList* _tmp1_; + GeeList* _tmp2_; gint _import_result_size = 0; - GeeList* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + GeeList* _tmp3_; + gint _tmp4_; + gint _tmp5_; gint _import_result_index = 0; #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = background_job; @@ -6005,16 +5975,16 @@ static gboolean batch_import_report_failures (BatchImport* self, BackgroundImpor _import_result_index = -1; #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 6009 "BatchImport.c" - gint _tmp6_ = 0; - gint _tmp7_ = 0; - gint _tmp8_ = 0; +#line 5979 "BatchImport.c" + gint _tmp6_; + gint _tmp7_; + gint _tmp8_; BatchImportResult* import_result = NULL; - GeeList* _tmp9_ = NULL; - gint _tmp10_ = 0; - gpointer _tmp11_ = NULL; - BatchImportResult* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; + GeeList* _tmp9_; + gint _tmp10_; + gpointer _tmp11_; + BatchImportResult* _tmp12_; + gboolean _tmp13_; #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = _import_result_index; #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6027,7 +5997,7 @@ static gboolean batch_import_report_failures (BatchImport* self, BackgroundImpor if (!(_tmp7_ < _tmp8_)) { #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 6031 "BatchImport.c" +#line 6001 "BatchImport.c" } #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = _import_result_list; @@ -6045,33 +6015,33 @@ static gboolean batch_import_report_failures (BatchImport* self, BackgroundImpor if (!_tmp13_) { #line 601 "/home/jens/Source/shotwell/src/BatchImport.vala" proceed = FALSE; -#line 6049 "BatchImport.c" +#line 6019 "BatchImport.c" } #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (import_result); -#line 6053 "BatchImport.c" +#line 6023 "BatchImport.c" } #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_import_result_list); -#line 6057 "BatchImport.c" +#line 6027 "BatchImport.c" } #line 604 "/home/jens/Source/shotwell/src/BatchImport.vala" result = proceed; #line 604 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 6063 "BatchImport.c" +#line 6033 "BatchImport.c" } static void batch_import_report_completed (BatchImport* self, const gchar* where) { - gboolean _tmp0_ = FALSE; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - BatchImportImportReporter _tmp5_ = NULL; - void* _tmp5__target = NULL; - ImportManifest* _tmp9_ = NULL; - BatchImportRoll* _tmp10_ = NULL; + gboolean _tmp0_; + const gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + BatchImportImportReporter _tmp5_; + void* _tmp5__target; + ImportManifest* _tmp9_; + BatchImportRoll* _tmp10_; #line 607 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 607 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6080,14 +6050,14 @@ static void batch_import_report_completed (BatchImport* self, const gchar* where _tmp0_ = self->priv->completed; #line 608 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp0_) { -#line 6084 "BatchImport.c" - const gchar* _tmp1_ = NULL; +#line 6054 "BatchImport.c" + const gchar* _tmp1_; #line 609 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = where; #line 609 "/home/jens/Source/shotwell/src/BatchImport.vala" g_error ("BatchImport.vala:609: Attempted to complete already-completed import: " \ "%s", _tmp1_); -#line 6090 "BatchImport.c" +#line 6060 "BatchImport.c" } #line 611 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->completed = TRUE; @@ -6109,11 +6079,11 @@ static void batch_import_report_completed (BatchImport* self, const gchar* where _tmp5__target = self->priv->reporter_target; #line 618 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp5_ != NULL) { -#line 6112 "BatchImport.c" - BatchImportImportReporter _tmp6_ = NULL; - void* _tmp6__target = NULL; - ImportManifest* _tmp7_ = NULL; - BatchImportRoll* _tmp8_ = NULL; +#line 6082 "BatchImport.c" + BatchImportImportReporter _tmp6_; + void* _tmp6__target; + ImportManifest* _tmp7_; + BatchImportRoll* _tmp8_; #line 619 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = self->priv->reporter; #line 619 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6124,23 +6094,23 @@ static void batch_import_report_completed (BatchImport* self, const gchar* where _tmp8_ = self->priv->import_roll; #line 619 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ (_tmp7_, _tmp8_, _tmp6__target); -#line 6127 "BatchImport.c" +#line 6097 "BatchImport.c" } #line 621 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = self->priv->manifest; #line 621 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = self->priv->import_roll; #line 621 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_emit_by_name (self, "import-complete", _tmp9_, _tmp10_); -#line 6135 "BatchImport.c" + g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORT_COMPLETE_SIGNAL], 0, _tmp9_, _tmp10_); +#line 6105 "BatchImport.c" } static void batch_import_file_import_complete (BatchImport* self) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp0_; + gint _tmp1_; gboolean _tmp4_ = FALSE; - gint _tmp5_ = 0; + gint _tmp5_; #line 625 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 627 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6151,41 +6121,41 @@ static void batch_import_file_import_complete (BatchImport* self) { _tmp1_ = self->priv->file_imports_to_perform; #line 628 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp1_ != -1) { -#line 6154 "BatchImport.c" - gint _tmp2_ = 0; - gint _tmp3_ = 0; +#line 6124 "BatchImport.c" + gint _tmp2_; + gint _tmp3_; #line 629 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = self->priv->file_imports_completed; #line 629 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = self->priv->file_imports_to_perform; #line 629 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (_tmp2_ <= _tmp3_, "file_imports_completed <= file_imports_to_perform"); -#line 6163 "BatchImport.c" +#line 6133 "BatchImport.c" } #line 633 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = self->priv->file_imports_to_perform; #line 633 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp5_ != -1) { -#line 6169 "BatchImport.c" - gint _tmp6_ = 0; - gint _tmp7_ = 0; +#line 6139 "BatchImport.c" + gint _tmp6_; + gint _tmp7_; #line 633 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = self->priv->file_imports_completed; #line 633 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = self->priv->file_imports_to_perform; #line 633 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = _tmp6_ == _tmp7_; -#line 6178 "BatchImport.c" +#line 6148 "BatchImport.c" } else { #line 633 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = FALSE; -#line 6182 "BatchImport.c" +#line 6152 "BatchImport.c" } #line 633 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp4_) { #line 634 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_report_completed (self, "completed preparing files, all outstanding imports completed"); -#line 6188 "BatchImport.c" +#line 6158 "BatchImport.c" } } @@ -6193,14 +6163,14 @@ static void batch_import_file_import_complete (BatchImport* self) { static void _batch_import_on_work_sniffed_out_completion_callback (BackgroundJob* job, gpointer self) { #line 644 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_on_work_sniffed_out ((BatchImport*) self, job); -#line 6196 "BatchImport.c" +#line 6166 "BatchImport.c" } static void _batch_import_on_sniffer_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { #line 644 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_on_sniffer_cancelled ((BatchImport*) self, job); -#line 6203 "BatchImport.c" +#line 6173 "BatchImport.c" } @@ -6209,19 +6179,19 @@ static gboolean _batch_import_on_sniffer_working_gsource_func (gpointer self) { result = batch_import_on_sniffer_working ((BatchImport*) self); #line 646 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 6212 "BatchImport.c" +#line 6182 "BatchImport.c" } void batch_import_schedule (BatchImport* self) { - gboolean _tmp0_ = FALSE; - Workers* _tmp1_ = NULL; - GeeIterable* _tmp2_ = NULL; - GCancellable* _tmp3_ = NULL; - GeeHashSet* _tmp4_ = NULL; - WorkSniffer* _tmp5_ = NULL; - WorkSniffer* _tmp6_ = NULL; - guint _tmp7_ = 0U; + gboolean _tmp0_; + Workers* _tmp1_; + GeeIterable* _tmp2_; + GCancellable* _tmp3_; + GeeHashSet* _tmp4_; + WorkSniffer* _tmp5_; + WorkSniffer* _tmp6_; + guint _tmp7_; #line 637 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 638 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6231,7 +6201,7 @@ void batch_import_schedule (BatchImport* self) { #line 639 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->scheduled = TRUE; #line 641 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_emit_by_name (self, "starting"); + g_signal_emit (self, batch_import_signals[BATCH_IMPORT_STARTING_SIGNAL], 0); #line 644 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = batch_import_feeder_workers; #line 644 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6252,7 +6222,7 @@ void batch_import_schedule (BatchImport* self) { _tmp7_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) BATCH_IMPORT_WORK_SNIFFER_THROBBER_MSEC, _batch_import_on_sniffer_working_gsource_func, g_object_ref (self), g_object_unref); #line 646 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->throbber_id = _tmp7_; -#line 6255 "BatchImport.c" +#line 6225 "BatchImport.c" } @@ -6266,56 +6236,56 @@ static gboolean batch_import_on_sniffer_working (BatchImport* self) { result = TRUE; #line 656 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 6269 "BatchImport.c" +#line 6239 "BatchImport.c" } static gpointer _background_job_ref0 (gpointer self) { #line 662 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? background_job_ref (self) : NULL; -#line 6276 "BatchImport.c" +#line 6246 "BatchImport.c" } static void _batch_import_on_file_prepared_notification_callback (BackgroundJob* job, NotificationObject* user, gpointer self) { #line 679 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_on_file_prepared ((BatchImport*) self, job, user); -#line 6283 "BatchImport.c" +#line 6253 "BatchImport.c" } static void _batch_import_on_files_prepared_completion_callback (BackgroundJob* job, gpointer self) { #line 679 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_on_files_prepared ((BatchImport*) self, job); -#line 6290 "BatchImport.c" +#line 6260 "BatchImport.c" } static void _batch_import_on_file_prepare_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { #line 679 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_on_file_prepare_cancelled ((BatchImport*) self, job); -#line 6297 "BatchImport.c" +#line 6267 "BatchImport.c" } static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob* j) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; WorkSniffer* sniffer = NULL; - BackgroundJob* _tmp1_ = NULL; - WorkSniffer* _tmp2_ = NULL; + BackgroundJob* _tmp1_; + WorkSniffer* _tmp2_; gboolean _tmp3_ = FALSE; - WorkSniffer* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - WorkSniffer* _tmp10_ = NULL; - guint64 _tmp11_ = 0ULL; + WorkSniffer* _tmp4_; + gboolean _tmp5_; + WorkSniffer* _tmp10_; + guint64 _tmp11_; PrepareFilesJob* prepare_files_job = NULL; - WorkSniffer* _tmp12_ = NULL; - GeeList* _tmp13_ = NULL; - GCancellable* _tmp14_ = NULL; - PrepareFilesJob* _tmp15_ = NULL; - Workers* _tmp16_ = NULL; - PrepareFilesJob* _tmp17_ = NULL; - guint _tmp18_ = 0U; + WorkSniffer* _tmp12_; + GeeList* _tmp13_; + GCancellable* _tmp14_; + PrepareFilesJob* _tmp15_; + Workers* _tmp16_; + PrepareFilesJob* _tmp17_; + guint _tmp18_; #line 659 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 659 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6340,12 +6310,12 @@ static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob* if (!_tmp5_) { #line 666 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = TRUE; -#line 6343 "BatchImport.c" +#line 6313 "BatchImport.c" } else { - WorkSniffer* _tmp6_ = NULL; - GeeList* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; + WorkSniffer* _tmp6_; + GeeList* _tmp7_; + gint _tmp8_; + gint _tmp9_; #line 666 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = sniffer; #line 666 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6356,7 +6326,7 @@ static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob* _tmp9_ = _tmp8_; #line 666 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = _tmp9_ == 0; -#line 6359 "BatchImport.c" +#line 6329 "BatchImport.c" } #line 666 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp3_) { @@ -6366,7 +6336,7 @@ static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob* _background_job_unref0 (sniffer); #line 669 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 6369 "BatchImport.c" +#line 6339 "BatchImport.c" } #line 672 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = sniffer; @@ -6394,31 +6364,31 @@ static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob* _tmp18_ = self->priv->throbber_id; #line 684 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp18_ > ((guint) 0)) { -#line 6397 "BatchImport.c" - guint _tmp19_ = 0U; +#line 6367 "BatchImport.c" + guint _tmp19_; #line 685 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp19_ = self->priv->throbber_id; #line 685 "/home/jens/Source/shotwell/src/BatchImport.vala" g_source_remove (_tmp19_); #line 686 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->throbber_id = (guint) 0; -#line 6405 "BatchImport.c" +#line 6375 "BatchImport.c" } #line 659 "/home/jens/Source/shotwell/src/BatchImport.vala" _background_job_unref0 (prepare_files_job); #line 659 "/home/jens/Source/shotwell/src/BatchImport.vala" _background_job_unref0 (sniffer); -#line 6411 "BatchImport.c" +#line 6381 "BatchImport.c" } static void batch_import_on_sniffer_cancelled (BatchImport* self, BackgroundJob* j) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; WorkSniffer* sniffer = NULL; - BackgroundJob* _tmp1_ = NULL; - WorkSniffer* _tmp2_ = NULL; - WorkSniffer* _tmp3_ = NULL; - guint _tmp4_ = 0U; + BackgroundJob* _tmp1_; + WorkSniffer* _tmp2_; + WorkSniffer* _tmp3_; + guint _tmp4_; #line 690 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 690 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6445,47 +6415,47 @@ static void batch_import_on_sniffer_cancelled (BatchImport* self, BackgroundJob* _tmp4_ = self->priv->throbber_id; #line 700 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp4_ > ((guint) 0)) { -#line 6448 "BatchImport.c" - guint _tmp5_ = 0U; +#line 6418 "BatchImport.c" + guint _tmp5_; #line 701 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = self->priv->throbber_id; #line 701 "/home/jens/Source/shotwell/src/BatchImport.vala" g_source_remove (_tmp5_); #line 702 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->throbber_id = (guint) 0; -#line 6456 "BatchImport.c" +#line 6426 "BatchImport.c" } #line 690 "/home/jens/Source/shotwell/src/BatchImport.vala" _background_job_unref0 (sniffer); -#line 6460 "BatchImport.c" +#line 6430 "BatchImport.c" } static void _batch_import_on_thumbnail_writer_completed_completion_callback (BackgroundJob* job, gpointer self) { #line 716 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_on_thumbnail_writer_completed ((BatchImport*) self, job); -#line 6467 "BatchImport.c" +#line 6437 "BatchImport.c" } static void _batch_import_on_thumbnail_writer_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { #line 716 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_on_thumbnail_writer_cancelled ((BatchImport*) self, job); -#line 6474 "BatchImport.c" +#line 6444 "BatchImport.c" } static void _batch_import_on_import_files_completed_completion_callback (BackgroundJob* job, gpointer self) { #line 721 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_on_import_files_completed ((BatchImport*) self, job); -#line 6481 "BatchImport.c" +#line 6451 "BatchImport.c" } static void _batch_import_on_import_files_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { #line 721 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_on_import_files_cancelled ((BatchImport*) self, job); -#line 6488 "BatchImport.c" +#line 6458 "BatchImport.c" } @@ -6494,18 +6464,18 @@ static void batch_import_flush_import_jobs (BatchImport* self) { g_return_if_fail (IS_BATCH_IMPORT (self)); #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 6497 "BatchImport.c" +#line 6467 "BatchImport.c" gboolean _tmp0_ = FALSE; - GeeList* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - Workers* _tmp7_ = NULL; - GeeList* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - CompletedImportObject* _tmp10_ = NULL; - GCancellable* _tmp11_ = NULL; - ThumbnailWriterJob* _tmp12_ = NULL; - ThumbnailWriterJob* _tmp13_ = NULL; + GeeList* _tmp1_; + gint _tmp2_; + gint _tmp3_; + Workers* _tmp7_; + GeeList* _tmp8_; + gpointer _tmp9_; + CompletedImportObject* _tmp10_; + GCancellable* _tmp11_; + ThumbnailWriterJob* _tmp12_; + ThumbnailWriterJob* _tmp13_; #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = self->priv->ready_thumbnails; #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6514,10 +6484,10 @@ static void batch_import_flush_import_jobs (BatchImport* self) { _tmp3_ = _tmp2_; #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp3_ > 0) { -#line 6517 "BatchImport.c" - Workers* _tmp4_ = NULL; - gint _tmp5_ = 0; - guint _tmp6_ = 0U; +#line 6487 "BatchImport.c" + Workers* _tmp4_; + gint _tmp5_; + guint _tmp6_; #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = batch_import_import_workers; #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6526,17 +6496,17 @@ static void batch_import_flush_import_jobs (BatchImport* self) { _tmp6_ = self->priv->max_outstanding_import_jobs; #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = ((guint) _tmp5_) < _tmp6_; -#line 6529 "BatchImport.c" +#line 6499 "BatchImport.c" } else { #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = FALSE; -#line 6533 "BatchImport.c" +#line 6503 "BatchImport.c" } #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!_tmp0_) { #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 6539 "BatchImport.c" +#line 6509 "BatchImport.c" } #line 716 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = batch_import_import_workers; @@ -6558,24 +6528,24 @@ static void batch_import_flush_import_jobs (BatchImport* self) { _background_job_unref0 (_tmp13_); #line 716 "/home/jens/Source/shotwell/src/BatchImport.vala" _completed_import_object_unref0 (_tmp10_); -#line 6561 "BatchImport.c" +#line 6531 "BatchImport.c" } #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 6565 "BatchImport.c" +#line 6535 "BatchImport.c" gboolean _tmp14_ = FALSE; - GeeList* _tmp15_ = NULL; - gint _tmp16_ = 0; - gint _tmp17_ = 0; - Workers* _tmp21_ = NULL; - GeeList* _tmp22_ = NULL; - gpointer _tmp23_ = NULL; - PreparedFile* _tmp24_ = NULL; - BatchImportRoll* _tmp25_ = NULL; - ImportID _tmp26_ = {0}; - GCancellable* _tmp27_ = NULL; - PreparedFileImportJob* _tmp28_ = NULL; - PreparedFileImportJob* _tmp29_ = NULL; + GeeList* _tmp15_; + gint _tmp16_; + gint _tmp17_; + Workers* _tmp21_; + GeeList* _tmp22_; + gpointer _tmp23_; + PreparedFile* _tmp24_; + BatchImportRoll* _tmp25_; + ImportID _tmp26_; + GCancellable* _tmp27_; + PreparedFileImportJob* _tmp28_; + PreparedFileImportJob* _tmp29_; #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp15_ = self->priv->ready_files; #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6584,10 +6554,10 @@ static void batch_import_flush_import_jobs (BatchImport* self) { _tmp17_ = _tmp16_; #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp17_ > 0) { -#line 6587 "BatchImport.c" - Workers* _tmp18_ = NULL; - gint _tmp19_ = 0; - guint _tmp20_ = 0U; +#line 6557 "BatchImport.c" + Workers* _tmp18_; + gint _tmp19_; + guint _tmp20_; #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp18_ = batch_import_import_workers; #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6596,17 +6566,17 @@ static void batch_import_flush_import_jobs (BatchImport* self) { _tmp20_ = self->priv->max_outstanding_import_jobs; #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = ((guint) _tmp19_) < _tmp20_; -#line 6599 "BatchImport.c" +#line 6569 "BatchImport.c" } else { #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = FALSE; -#line 6603 "BatchImport.c" +#line 6573 "BatchImport.c" } #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!_tmp14_) { #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 6609 "BatchImport.c" +#line 6579 "BatchImport.c" } #line 721 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp21_ = batch_import_import_workers; @@ -6632,7 +6602,7 @@ static void batch_import_flush_import_jobs (BatchImport* self) { _background_job_unref0 (_tmp29_); #line 721 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_tmp24_); -#line 6635 "BatchImport.c" +#line 6605 "BatchImport.c" } } @@ -6640,10 +6610,10 @@ static void batch_import_flush_import_jobs (BatchImport* self) { static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFile* prepared_file) { GFile* result = NULL; gboolean _tmp0_ = FALSE; - PreparedFile* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PreparedFile* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; + PreparedFile* _tmp1_; + const gchar* _tmp2_; + PreparedFile* _tmp11_; + const gchar* _tmp12_; #line 729 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (self), NULL); #line 729 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6654,11 +6624,11 @@ static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFil _tmp2_ = _tmp1_->full_md5; #line 731 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp2_ != NULL) { -#line 6657 "BatchImport.c" - GeeHashMap* _tmp3_ = NULL; - PreparedFile* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; +#line 6627 "BatchImport.c" + GeeHashMap* _tmp3_; + PreparedFile* _tmp4_; + const gchar* _tmp5_; + gboolean _tmp6_; #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = self->priv->imported_full_md5_table; #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6669,19 +6639,19 @@ static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFil _tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_); #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp6_; -#line 6672 "BatchImport.c" +#line 6642 "BatchImport.c" } else { #line 731 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = FALSE; -#line 6676 "BatchImport.c" +#line 6646 "BatchImport.c" } #line 731 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp0_) { -#line 6680 "BatchImport.c" - GeeHashMap* _tmp7_ = NULL; - PreparedFile* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gpointer _tmp10_ = NULL; +#line 6650 "BatchImport.c" + GeeHashMap* _tmp7_; + PreparedFile* _tmp8_; + const gchar* _tmp9_; + gpointer _tmp10_; #line 734 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = self->priv->imported_full_md5_table; #line 734 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6694,7 +6664,7 @@ static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFil result = (GFile*) _tmp10_; #line 734 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 6697 "BatchImport.c" +#line 6667 "BatchImport.c" } #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = prepared_file; @@ -6702,12 +6672,12 @@ static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFil _tmp12_ = _tmp11_->full_md5; #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp12_ != NULL) { -#line 6705 "BatchImport.c" - GeeHashMap* _tmp13_ = NULL; - PreparedFile* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - PreparedFile* _tmp16_ = NULL; - GFile* _tmp17_ = NULL; +#line 6675 "BatchImport.c" + GeeHashMap* _tmp13_; + PreparedFile* _tmp14_; + const gchar* _tmp15_; + PreparedFile* _tmp16_; + GFile* _tmp17_; #line 739 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = self->priv->imported_full_md5_table; #line 739 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6720,34 +6690,34 @@ static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFil _tmp17_ = _tmp16_->file; #line 739 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_, _tmp17_); -#line 6723 "BatchImport.c" +#line 6693 "BatchImport.c" } #line 741 "/home/jens/Source/shotwell/src/BatchImport.vala" result = NULL; #line 741 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 6729 "BatchImport.c" +#line 6699 "BatchImport.c" } static gpointer _notification_object_ref0 (gpointer self) { #line 748 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? notification_object_ref (self) : NULL; -#line 6736 "BatchImport.c" +#line 6706 "BatchImport.c" } static void batch_import_on_file_prepared (BatchImport* self, BackgroundJob* j, NotificationObject* user) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; PreparedFileCluster* cluster = NULL; - NotificationObject* _tmp1_ = NULL; - PreparedFileCluster* _tmp2_ = NULL; - GeeArrayList* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GeeArrayList* _tmp8_ = NULL; + NotificationObject* _tmp1_; + PreparedFileCluster* _tmp2_; + GeeArrayList* _tmp3_; + gint _tmp4_; + gint _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + GeeArrayList* _tmp8_; #line 745 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 745 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6784,7 +6754,7 @@ static void batch_import_on_file_prepared (BatchImport* self, BackgroundJob* j, batch_import_process_prepared_files (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_LIST, GeeList), NULL, NULL); #line 745 "/home/jens/Source/shotwell/src/BatchImport.vala" _notification_object_unref0 (cluster); -#line 6787 "BatchImport.c" +#line 6757 "BatchImport.c" } @@ -6797,21 +6767,45 @@ static void batch_import_process_prepared_files_data_free (gpointer _data) { _g_object_unref0 (_data_->self); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" g_slice_free (BatchImportProcessPreparedFilesData, _data_); -#line 6800 "BatchImport.c" +#line 6770 "BatchImport.c" +} + + +static void batch_import_process_prepared_files_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { + BatchImportProcessPreparedFilesData* _task_data_; +#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" + _task_data_ = g_task_get_task_data (G_TASK (res)); +#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" + if (_task_data_->_callback_ != NULL) { +#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" + _task_data_->_callback_ (source_object, res, user_data); +#line 6782 "BatchImport.c" + } +#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" + _task_data_->_task_complete_ = TRUE; +#line 6786 "BatchImport.c" } static void batch_import_process_prepared_files (BatchImport* self, GeeList* list, GAsyncReadyCallback _callback_, gpointer _user_data_) { BatchImportProcessPreparedFilesData* _data_; - BatchImport* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; + BatchImport* _tmp0_; + GeeList* _tmp1_; + GeeList* _tmp2_; #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_ = g_slice_new0 (BatchImportProcessPreparedFilesData); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, batch_import_process_prepared_files); + _data_->_callback_ = _callback_; +#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" + _data_->_async_result = g_task_new (G_OBJECT (self), NULL, batch_import_process_prepared_files_async_ready_wrapper, _user_data_); +#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" + if (_callback_ == NULL) { +#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" + _data_->_task_complete_ = TRUE; +#line 6805 "BatchImport.c" + } #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, batch_import_process_prepared_files_data_free); + g_task_set_task_data (_data_->_async_result, _data_, batch_import_process_prepared_files_data_free); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _g_object_ref0 (self); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -6826,15 +6820,15 @@ static void batch_import_process_prepared_files (BatchImport* self, GeeList* lis _data_->list = _tmp2_; #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_process_prepared_files_co (_data_); -#line 6829 "BatchImport.c" +#line 6823 "BatchImport.c" } static void batch_import_process_prepared_files_finish (BatchImport* self, GAsyncResult* _res_) { BatchImportProcessPreparedFilesData* _data_; #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 6837 "BatchImport.c" + _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); +#line 6831 "BatchImport.c" } @@ -6843,7 +6837,7 @@ static gboolean _batch_import_process_prepared_files_co_gsource_func (gpointer s result = batch_import_process_prepared_files_co (self); #line 759 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 6846 "BatchImport.c" +#line 6840 "BatchImport.c" } @@ -6852,40 +6846,30 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar switch (_data_->_state_) { #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala" case 0: -#line 6855 "BatchImport.c" +#line 6849 "BatchImport.c" goto _state_0; #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala" case 1: -#line 6859 "BatchImport.c" +#line 6853 "BatchImport.c" goto _state_1; default: #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala" g_assert_not_reached (); -#line 6864 "BatchImport.c" +#line 6858 "BatchImport.c" } _state_0: { #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp0_ = NULL; -#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp0_ = _data_->list; #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp1_ = NULL; -#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp1_ = _g_object_ref0 (_data_->_tmp0_); #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_prepared_file_list = _data_->_tmp1_; #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp2_ = NULL; -#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp2_ = _data_->_prepared_file_list; #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp3_ = 0; -#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp4_ = 0; -#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp4_ = _data_->_tmp3_; #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_prepared_file_size = _data_->_tmp4_; @@ -6894,36 +6878,24 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp5_ = 0; -#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp5_ = _data_->_prepared_file_index; #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_prepared_file_index = _data_->_tmp5_ + 1; #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp6_ = 0; -#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp6_ = _data_->_prepared_file_index; #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp7_ = 0; -#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp7_ = _data_->_prepared_file_size; #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!(_data_->_tmp6_ < _data_->_tmp7_)) { #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 6914 "BatchImport.c" +#line 6892 "BatchImport.c" } #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp8_ = NULL; -#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp8_ = _data_->_prepared_file_list; #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp9_ = 0; -#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp9_ = _data_->_prepared_file_index; #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp10_ = NULL; -#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp10_ = gee_list_get (_data_->_tmp8_, _data_->_tmp9_); #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->prepared_file = (PreparedFile*) _data_->_tmp10_; @@ -6933,42 +6905,30 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar _data_->_state_ = 1; #line 760 "/home/jens/Source/shotwell/src/BatchImport.vala" return FALSE; -#line 6936 "BatchImport.c" +#line 6908 "BatchImport.c" _state_1: ; #line 762 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->import_result = NULL; #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp11_ = NULL; -#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp11_ = library_photo_global; #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp12_ = NULL; -#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp12_ = _data_->prepared_file; #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp13_ = NULL; -#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp13_ = _data_->_tmp12_->file; #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp14_ = 0; #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp15_ = NULL; -#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp15_ = library_photo_source_collection_get_state_by_file (_data_->_tmp11_, _data_->_tmp13_, &_data_->_tmp14_); #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->photo_state = _data_->_tmp14_; #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->photo = _data_->_tmp15_; #line 769 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp16_ = NULL; -#line 769 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp16_ = _data_->photo; #line 769 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp16_ != NULL) { #line 770 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp17_ = 0; -#line 770 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp17_ = _data_->photo_state; #line 770 "/home/jens/Source/shotwell/src/BatchImport.vala" switch (_data_->_tmp17_) { @@ -6980,79 +6940,43 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE: #line 770 "/home/jens/Source/shotwell/src/BatchImport.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER: -#line 6983 "BatchImport.c" +#line 6943 "BatchImport.c" { #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp18_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp18_ = _data_->prepared_file; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp19_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp19_ = _data_->_tmp18_->job; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp20_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp20_ = _data_->prepared_file; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp21_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp21_ = _data_->_tmp20_->file; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp22_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp22_ = _data_->prepared_file; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp23_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp23_ = _data_->_tmp22_->file; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp24_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp24_ = g_file_get_path (_data_->_tmp23_); #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp25_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp25_ = _data_->_tmp24_; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp26_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp26_ = _data_->prepared_file; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp27_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp27_ = _data_->_tmp26_->file; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp28_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp28_ = g_file_get_path (_data_->_tmp27_); #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp29_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp29_ = _data_->_tmp28_; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp30_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp30_ = _data_->photo; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp31_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp31_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp30_, TYPE_MEDIA_SOURCE, MediaSource)); #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp32_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp32_ = _data_->_tmp31_; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp33_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp33_ = duplicated_file_create_from_file (_data_->_tmp32_); #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp34_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp34_ = _data_->_tmp33_; #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp35_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp35_ = batch_import_result_new (_data_->_tmp19_, _data_->_tmp21_, _data_->_tmp25_, _data_->_tmp29_, _data_->_tmp34_, IMPORT_RESULT_PHOTO_EXISTS); #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (_data_->import_result); @@ -7067,56 +6991,44 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_data_->_tmp25_); #line 780 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp36_ = 0; -#line 780 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp36_ = _data_->photo_state; #line 780 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp36_ == LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE) { #line 781 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp37_ = NULL; -#line 781 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp37_ = _data_->photo; #line 781 "/home/jens/Source/shotwell/src/BatchImport.vala" media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp37_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 7081 "BatchImport.c" +#line 7001 "BatchImport.c" } #line 782 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 7085 "BatchImport.c" +#line 7005 "BatchImport.c" } #line 770 "/home/jens/Source/shotwell/src/BatchImport.vala" case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH: -#line 7089 "BatchImport.c" +#line 7009 "BatchImport.c" { #line 786 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 7093 "BatchImport.c" +#line 7013 "BatchImport.c" } default: { #line 789 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp38_ = 0; -#line 789 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp38_ = _data_->photo_state; #line 789 "/home/jens/Source/shotwell/src/BatchImport.vala" - memset (&_data_->_tmp39_, 0, sizeof (GEnumValue*)); -#line 789 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp39_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _data_->_tmp38_); #line 789 "/home/jens/Source/shotwell/src/BatchImport.vala" g_error ("BatchImport.vala:789: Unknown LibraryPhotoSourceCollection state: %s", (_data_->_tmp39_ != NULL) ? _data_->_tmp39_->value_name : NULL); -#line 7107 "BatchImport.c" +#line 7023 "BatchImport.c" } } } #line 793 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp40_ = NULL; -#line 793 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp40_ = _data_->import_result; #line 793 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp40_ != NULL) { #line 794 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp41_ = NULL; -#line 794 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp41_ = _data_->import_result; #line 794 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_report_failure (_data_->self, _data_->_tmp41_); @@ -7130,39 +7042,27 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar _prepared_file_unref0 (_data_->prepared_file); #line 797 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 7133 "BatchImport.c" +#line 7045 "BatchImport.c" } #line 801 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp42_ = NULL; -#line 801 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp42_ = video_global; #line 801 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp43_ = NULL; -#line 801 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp43_ = _data_->prepared_file; #line 801 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp44_ = NULL; -#line 801 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp44_ = _data_->_tmp43_->file; #line 801 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp45_ = 0; #line 801 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp46_ = NULL; -#line 801 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp46_ = video_source_collection_get_state_by_file (_data_->_tmp42_, _data_->_tmp44_, &_data_->_tmp45_); #line 801 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->video_state = _data_->_tmp45_; #line 801 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->video = _data_->_tmp46_; #line 802 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp47_ = NULL; -#line 802 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp47_ = _data_->video; #line 802 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp47_ != NULL) { #line 803 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp48_ = 0; -#line 803 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp48_ = _data_->video_state; #line 803 "/home/jens/Source/shotwell/src/BatchImport.vala" switch (_data_->_tmp48_) { @@ -7170,79 +7070,43 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar case VIDEO_SOURCE_COLLECTION_STATE_ONLINE: #line 803 "/home/jens/Source/shotwell/src/BatchImport.vala" case VIDEO_SOURCE_COLLECTION_STATE_OFFLINE: -#line 7173 "BatchImport.c" +#line 7073 "BatchImport.c" { #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp49_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp49_ = _data_->prepared_file; #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp50_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp50_ = _data_->_tmp49_->job; #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp51_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp51_ = _data_->prepared_file; #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp52_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp52_ = _data_->_tmp51_->file; #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp53_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp53_ = _data_->prepared_file; #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp54_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp54_ = _data_->_tmp53_->file; #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp55_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp55_ = g_file_get_path (_data_->_tmp54_); #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp56_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp56_ = _data_->_tmp55_; #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp57_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp57_ = _data_->prepared_file; #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp58_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp58_ = _data_->_tmp57_->file; #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp59_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp59_ = g_file_get_path (_data_->_tmp58_); #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp60_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp60_ = _data_->_tmp59_; #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp61_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp61_ = _data_->video; #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp62_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp62_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp61_, TYPE_MEDIA_SOURCE, MediaSource)); #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp63_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp63_ = _data_->_tmp62_; #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp64_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp64_ = duplicated_file_create_from_file (_data_->_tmp63_); #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp65_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp65_ = _data_->_tmp64_; #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp66_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp66_ = batch_import_result_new (_data_->_tmp50_, _data_->_tmp52_, _data_->_tmp56_, _data_->_tmp60_, _data_->_tmp65_, IMPORT_RESULT_PHOTO_EXISTS); #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (_data_->import_result); @@ -7257,56 +7121,44 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_data_->_tmp56_); #line 811 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp67_ = 0; -#line 811 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp67_ = _data_->video_state; #line 811 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp67_ == VIDEO_SOURCE_COLLECTION_STATE_OFFLINE) { #line 812 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp68_ = NULL; -#line 812 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp68_ = _data_->video; #line 812 "/home/jens/Source/shotwell/src/BatchImport.vala" media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp68_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 7271 "BatchImport.c" +#line 7131 "BatchImport.c" } #line 813 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 7275 "BatchImport.c" +#line 7135 "BatchImport.c" } #line 803 "/home/jens/Source/shotwell/src/BatchImport.vala" case VIDEO_SOURCE_COLLECTION_STATE_TRASH: -#line 7279 "BatchImport.c" +#line 7139 "BatchImport.c" { #line 817 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 7283 "BatchImport.c" +#line 7143 "BatchImport.c" } default: { #line 820 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp69_ = 0; -#line 820 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp69_ = _data_->video_state; #line 820 "/home/jens/Source/shotwell/src/BatchImport.vala" - memset (&_data_->_tmp70_, 0, sizeof (GEnumValue*)); -#line 820 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp70_ = g_enum_get_value (g_type_class_ref (VIDEO_SOURCE_COLLECTION_TYPE_STATE), _data_->_tmp69_); #line 820 "/home/jens/Source/shotwell/src/BatchImport.vala" g_error ("BatchImport.vala:820: Unknown VideoSourceCollection state: %s", (_data_->_tmp70_ != NULL) ? _data_->_tmp70_->value_name : NULL); -#line 7297 "BatchImport.c" +#line 7153 "BatchImport.c" } } } #line 824 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp71_ = NULL; -#line 824 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp71_ = _data_->import_result; #line 824 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp71_ != NULL) { #line 825 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp72_ = NULL; -#line 825 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp72_ = _data_->import_result; #line 825 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_report_failure (_data_->self, _data_->_tmp72_); @@ -7322,195 +7174,115 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar _prepared_file_unref0 (_data_->prepared_file); #line 828 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 7325 "BatchImport.c" +#line 7177 "BatchImport.c" } #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp74_ = NULL; -#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp74_ = _data_->prepared_file; #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp75_ = FALSE; -#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp75_ = _data_->_tmp74_->is_video; #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp75_) { #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp76_ = NULL; -#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp76_ = _data_->prepared_file; #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp77_ = NULL; -#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp77_ = _data_->_tmp76_->file; #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp78_ = NULL; -#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp78_ = _data_->prepared_file; #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp79_ = NULL; -#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp79_ = _data_->_tmp78_->full_md5; #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp80_ = FALSE; -#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp80_ = video_is_duplicate (_data_->_tmp77_, _data_->_tmp79_); #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp73_ = _data_->_tmp80_; -#line 7359 "BatchImport.c" +#line 7197 "BatchImport.c" } else { #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp73_ = FALSE; -#line 7363 "BatchImport.c" +#line 7201 "BatchImport.c" } #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp73_) { #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp81_ = NULL; -#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp81_ = video_table_get_instance (); #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp82_ = NULL; -#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp82_ = _data_->_tmp81_; #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp83_ = NULL; -#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp83_ = _data_->prepared_file; #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp84_ = NULL; -#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp84_ = _data_->_tmp83_->file; #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp85_ = NULL; -#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp85_ = _data_->prepared_file; #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp86_ = NULL; -#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp86_ = _data_->_tmp85_->full_md5; #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp87_ = 0; -#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp88_ = NULL; -#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp88_ = video_table_get_duplicate_ids (_data_->_tmp82_, _data_->_tmp84_, _data_->_tmp86_, &_data_->_tmp87_); #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp89_ = NULL; -#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp89__length1 = 0; -#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp89_ = _data_->_tmp88_; #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp89__length1 = _data_->_tmp87_; #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" _database_table_unref0 (_data_->_tmp82_); #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->duplicate_ids_length1 = 0; -#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_duplicate_ids_size_ = 0; -#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->duplicate_ids = _data_->_tmp89_; #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->duplicate_ids_length1 = _data_->_tmp89__length1; #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_duplicate_ids_size_ = _data_->duplicate_ids_length1; #line 837 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp90_ = NULL; -#line 837 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp90__length1 = 0; -#line 837 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp90_ = _data_->duplicate_ids; #line 837 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp90__length1 = _data_->duplicate_ids_length1; #line 837 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (_data_->_tmp90__length1 > 0, "duplicate_ids.length > 0"); #line 839 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp91_ = NULL; -#line 839 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp91__length1 = 0; -#line 839 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp91_ = _data_->duplicate_ids; #line 839 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp91__length1 = _data_->duplicate_ids_length1; #line 839 "/home/jens/Source/shotwell/src/BatchImport.vala" - memset (&_data_->_tmp92_, 0, sizeof (VideoID)); -#line 839 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp92_ = _data_->_tmp91_[0]; #line 839 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp93_ = NULL; -#line 839 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp93_ = duplicated_file_create_from_video_id (&_data_->_tmp92_); #line 839 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->duplicated_file = _data_->_tmp93_; #line 842 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->result_code = IMPORT_RESULT_PHOTO_EXISTS; #line 843 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp94_ = FALSE; -#line 843 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp94_ = _data_->self->priv->mark_duplicates_online; #line 843 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp94_) { #line 844 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp95_ = NULL; -#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp95_ = video_global; #line 844 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp96_ = NULL; -#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp96_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp95_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 844 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp97_ = NULL; -#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp97_ = _data_->_tmp96_; #line 844 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp98_ = NULL; -#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp98_ = _data_->prepared_file; #line 844 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp99_ = NULL; -#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp99_ = _data_->_tmp98_->file; #line 844 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp100_ = NULL; -#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp100_ = media_source_holding_tank_fetch_by_master_file (_data_->_tmp97_, _data_->_tmp99_); #line 844 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp101_ = NULL; -#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp101_ = G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp100_, TYPE_VIDEO, Video); #line 844 "/home/jens/Source/shotwell/src/BatchImport.vala" _source_holding_tank_unref0 (_data_->_tmp97_); #line 844 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->dupe_video = _data_->_tmp101_; #line 846 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp102_ = NULL; -#line 846 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp102_ = _data_->dupe_video; #line 846 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp102_ == NULL) { #line 847 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp103_ = NULL; -#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp103_ = video_global; #line 847 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp104_ = NULL; -#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp104_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp103_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 847 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp105_ = NULL; -#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp105_ = _data_->_tmp104_; #line 847 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp106_ = NULL; -#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp106_ = _data_->prepared_file; #line 847 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp107_ = NULL; -#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp107_ = _data_->_tmp106_->full_md5; #line 847 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp108_ = NULL; -#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp108_ = media_source_holding_tank_fetch_by_md5 (_data_->_tmp105_, _data_->_tmp107_); #line 847 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->dupe_video); @@ -7518,29 +7290,19 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar _data_->dupe_video = G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp108_, TYPE_VIDEO, Video); #line 847 "/home/jens/Source/shotwell/src/BatchImport.vala" _source_holding_tank_unref0 (_data_->_tmp105_); -#line 7521 "BatchImport.c" +#line 7293 "BatchImport.c" } #line 849 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp109_ = NULL; -#line 849 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp109_ = _data_->dupe_video; #line 849 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp109_ != NULL) { #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp110_ = NULL; -#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp110_ = _data_->prepared_file; #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp111_ = NULL; -#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp111_ = _data_->_tmp110_->file; #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp112_ = NULL; -#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp112_ = g_file_get_path (_data_->_tmp111_); #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp113_ = NULL; -#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp113_ = _data_->_tmp112_; #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" g_debug ("BatchImport.vala:850: duplicate video found offline, marking as online" \ @@ -7548,22 +7310,14 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_data_->_tmp113_); #line 853 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp114_ = NULL; -#line 853 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp114_ = _data_->dupe_video; #line 853 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp115_ = NULL; -#line 853 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp115_ = _data_->prepared_file; #line 853 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp116_ = NULL; -#line 853 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp116_ = _data_->_tmp115_->file; #line 853 "/home/jens/Source/shotwell/src/BatchImport.vala" monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp114_, TYPE_MONITORABLE, Monitorable), _data_->_tmp116_); #line 854 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp117_ = NULL; -#line 854 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp117_ = _data_->dupe_video; #line 854 "/home/jens/Source/shotwell/src/BatchImport.vala" media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp117_, TYPE_MEDIA_SOURCE, MediaSource)); @@ -7572,26 +7326,16 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar #line 856 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->duplicated_file = NULL; #line 858 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp118_ = NULL; -#line 858 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp118_ = _data_->self->priv->manifest; #line 858 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp119_ = NULL; -#line 858 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp119_ = _data_->_tmp118_->imported; #line 858 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp120_ = NULL; -#line 858 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp120_ = _data_->dupe_video; #line 858 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp119_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp120_, TYPE_MEDIA_SOURCE, MediaSource)); #line 859 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp121_ = NULL; -#line 859 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp121_ = _data_->dupe_video; #line 859 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp122_ = 0ULL; -#line 859 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp122_ = media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp121_, TYPE_MEDIA_SOURCE, MediaSource)); #line 859 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_report_progress (_data_->self, _data_->_tmp122_); @@ -7599,71 +7343,41 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar batch_import_file_import_complete (_data_->self); #line 862 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->result_code = IMPORT_RESULT_SUCCESS; -#line 7601 "BatchImport.c" +#line 7345 "BatchImport.c" } #line 843 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->dupe_video); -#line 7605 "BatchImport.c" +#line 7349 "BatchImport.c" } #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp123_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp123_ = _data_->prepared_file; #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp124_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp124_ = _data_->_tmp123_->job; #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp125_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp125_ = _data_->prepared_file; #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp126_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp126_ = _data_->_tmp125_->file; #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp127_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp127_ = _data_->prepared_file; #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp128_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp128_ = _data_->_tmp127_->file; #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp129_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp129_ = g_file_get_path (_data_->_tmp128_); #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp130_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp130_ = _data_->_tmp129_; #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp131_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp131_ = _data_->prepared_file; #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp132_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp132_ = _data_->_tmp131_->file; #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp133_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp133_ = g_file_get_path (_data_->_tmp132_); #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp134_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp134_ = _data_->_tmp133_; #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp135_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp135_ = _data_->duplicated_file; #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp136_ = 0; -#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp136_ = _data_->result_code; #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp137_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp137_ = batch_import_result_new (_data_->_tmp124_, _data_->_tmp126_, _data_->_tmp130_, _data_->_tmp134_, _data_->_tmp135_, _data_->_tmp136_); #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (_data_->import_result); @@ -7674,18 +7388,12 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_data_->_tmp130_); #line 870 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp138_ = 0; -#line 870 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp138_ = _data_->result_code; #line 870 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp138_ == IMPORT_RESULT_SUCCESS) { #line 871 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp139_ = NULL; -#line 871 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp139_ = _data_->self->priv->manifest; #line 871 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp140_ = NULL; -#line 871 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp140_ = _data_->import_result; #line 871 "/home/jens/Source/shotwell/src/BatchImport.vala" import_manifest_add_result (_data_->_tmp139_, _data_->_tmp140_); @@ -7703,105 +7411,61 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar _prepared_file_unref0 (_data_->prepared_file); #line 873 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 7705 "BatchImport.c" +#line 7413 "BatchImport.c" } #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->duplicated_file); #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->duplicate_ids = (g_free (_data_->duplicate_ids), NULL); -#line 7711 "BatchImport.c" +#line 7419 "BatchImport.c" } #line 877 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp141_ = NULL; -#line 877 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp141_ = _data_->prepared_file; #line 877 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp142_ = NULL; -#line 877 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp142_ = batch_import_get_in_current_import (_data_->self, _data_->_tmp141_); #line 877 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp143_ = NULL; -#line 877 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp143_ = _data_->_tmp142_; #line 877 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp144_ = FALSE; -#line 877 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp144_ = _data_->_tmp143_ != NULL; #line 877 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->_tmp143_); #line 877 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp144_) { #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp145_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp145_ = _data_->prepared_file; #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp146_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp146_ = _data_->_tmp145_->job; #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp147_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp147_ = _data_->prepared_file; #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp148_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp148_ = _data_->_tmp147_->file; #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp149_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp149_ = _data_->prepared_file; #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp150_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp150_ = _data_->_tmp149_->file; #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp151_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp151_ = g_file_get_path (_data_->_tmp150_); #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp152_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp152_ = _data_->_tmp151_; #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp153_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp153_ = _data_->prepared_file; #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp154_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp154_ = _data_->_tmp153_->file; #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp155_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp155_ = g_file_get_path (_data_->_tmp154_); #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp156_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp156_ = _data_->_tmp155_; #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp157_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp157_ = _data_->prepared_file; #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp158_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp158_ = batch_import_get_in_current_import (_data_->self, _data_->_tmp157_); #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp159_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp159_ = _data_->_tmp158_; #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp160_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp160_ = duplicated_file_create_from_file (_data_->_tmp159_); #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp161_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp161_ = _data_->_tmp160_; #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp162_ = NULL; -#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp162_ = batch_import_result_new (_data_->_tmp146_, _data_->_tmp148_, _data_->_tmp152_, _data_->_tmp156_, _data_->_tmp161_, IMPORT_RESULT_PHOTO_EXISTS); #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (_data_->import_result); @@ -7815,131 +7479,83 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar _g_free0 (_data_->_tmp156_); #line 880 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_data_->_tmp152_); -#line 7817 "BatchImport.c" +#line 7481 "BatchImport.c" } else { #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp163_ = NULL; -#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp163_ = _data_->prepared_file; #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp164_ = NULL; -#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp164_ = _data_->_tmp163_->file; #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp165_ = NULL; -#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp165_ = _data_->prepared_file; #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp166_ = NULL; -#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp166_ = _data_->_tmp165_->full_md5; #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp167_ = NULL; -#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp167_ = _data_->prepared_file; #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp168_ = 0; -#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp168_ = _data_->_tmp167_->file_format; #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp169_ = FALSE; -#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp169_ = photo_is_duplicate (_data_->_tmp164_, NULL, _data_->_tmp166_, _data_->_tmp168_); #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp169_) { #line 886 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp170_ = FALSE; -#line 886 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp170_ = _data_->self->priv->untrash_duplicates; #line 886 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp170_) { #line 889 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp171_ = NULL; -#line 889 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp171_ = library_photo_global; #line 889 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp172_ = NULL; -#line 889 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp172_ = _data_->prepared_file; #line 889 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp173_ = NULL; -#line 889 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp173_ = _data_->_tmp172_->file; #line 889 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp174_ = NULL; -#line 889 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp174_ = library_photo_source_collection_get_trashed_by_file (_data_->_tmp171_, _data_->_tmp173_); #line 889 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->photo); #line 889 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->photo = _data_->_tmp174_; #line 891 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp176_ = NULL; -#line 891 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp176_ = _data_->photo; #line 891 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp176_ == NULL) { #line 891 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp177_ = NULL; -#line 891 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp177_ = _data_->prepared_file; #line 891 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp178_ = NULL; -#line 891 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp178_ = _data_->_tmp177_->full_md5; #line 891 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp175_ = _data_->_tmp178_ != NULL; -#line 7891 "BatchImport.c" +#line 7525 "BatchImport.c" } else { #line 891 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp175_ = FALSE; -#line 7895 "BatchImport.c" +#line 7529 "BatchImport.c" } #line 891 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp175_) { #line 892 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp179_ = NULL; -#line 892 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp179_ = library_photo_global; #line 892 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp180_ = NULL; -#line 892 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp180_ = _data_->prepared_file; #line 892 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp181_ = NULL; -#line 892 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp181_ = _data_->_tmp180_->full_md5; #line 892 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp182_ = NULL; -#line 892 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp182_ = library_photo_source_collection_get_trashed_by_md5 (_data_->_tmp179_, _data_->_tmp181_); #line 892 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->photo); #line 892 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->photo = _data_->_tmp182_; -#line 7919 "BatchImport.c" +#line 7545 "BatchImport.c" } #line 894 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp183_ = NULL; -#line 894 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp183_ = _data_->photo; #line 894 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp183_ != NULL) { #line 895 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp184_ = NULL; -#line 895 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp184_ = _data_->prepared_file; #line 895 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp185_ = NULL; -#line 895 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp185_ = _data_->_tmp184_->file; #line 895 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp186_ = NULL; -#line 895 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp186_ = g_file_get_path (_data_->_tmp185_); #line 895 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp187_ = NULL; -#line 895 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp187_ = _data_->_tmp186_; #line 895 "/home/jens/Source/shotwell/src/BatchImport.vala" g_debug ("BatchImport.vala:895: duplicate linked photo found in trash, untrashin" \ @@ -7947,141 +7563,95 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar #line 895 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_data_->_tmp187_); #line 898 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp188_ = NULL; -#line 898 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp188_ = _data_->photo; #line 898 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp189_ = NULL; -#line 898 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp189_ = _data_->prepared_file; #line 898 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp190_ = NULL; -#line 898 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp190_ = _data_->_tmp189_->file; #line 898 "/home/jens/Source/shotwell/src/BatchImport.vala" monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp188_, TYPE_MONITORABLE, Monitorable), _data_->_tmp190_); #line 899 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp191_ = NULL; -#line 899 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp191_ = _data_->photo; #line 899 "/home/jens/Source/shotwell/src/BatchImport.vala" media_source_untrash (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp191_, TYPE_MEDIA_SOURCE, MediaSource)); #line 900 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp192_ = NULL; -#line 900 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp192_ = _data_->photo; #line 900 "/home/jens/Source/shotwell/src/BatchImport.vala" photo_remove_all_transformations (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp192_, TYPE_PHOTO, Photo)); -#line 7973 "BatchImport.c" +#line 7579 "BatchImport.c" } } #line 904 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp194_ = NULL; -#line 904 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp194_ = _data_->photo; #line 904 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp194_ == NULL) { #line 904 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp195_ = FALSE; -#line 904 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp195_ = _data_->self->priv->mark_duplicates_online; #line 904 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp193_ = _data_->_tmp195_; -#line 7988 "BatchImport.c" +#line 7590 "BatchImport.c" } else { #line 904 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp193_ = FALSE; -#line 7992 "BatchImport.c" +#line 7594 "BatchImport.c" } #line 904 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp193_) { #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp196_ = NULL; -#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp196_ = library_photo_global; #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp197_ = NULL; -#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp197_ = _data_->prepared_file; #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp198_ = NULL; -#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp198_ = _data_->_tmp197_->file; #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp199_ = NULL; -#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp199_ = library_photo_source_collection_get_offline_by_file (_data_->_tmp196_, _data_->_tmp198_); #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->photo); #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->photo = _data_->_tmp199_; #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp201_ = NULL; -#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp201_ = _data_->photo; #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp201_ == NULL) { #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp202_ = NULL; -#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp202_ = _data_->prepared_file; #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp203_ = NULL; -#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp203_ = _data_->_tmp202_->full_md5; #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp200_ = _data_->_tmp203_ != NULL; -#line 8032 "BatchImport.c" +#line 7620 "BatchImport.c" } else { #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp200_ = FALSE; -#line 8036 "BatchImport.c" +#line 7624 "BatchImport.c" } #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp200_) { #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp204_ = NULL; -#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp204_ = library_photo_global; #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp205_ = NULL; -#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp205_ = _data_->prepared_file; #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp206_ = NULL; -#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp206_ = _data_->_tmp205_->full_md5; #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp207_ = NULL; -#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp207_ = library_photo_source_collection_get_offline_by_md5 (_data_->_tmp204_, _data_->_tmp206_); #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->photo); #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->photo = _data_->_tmp207_; -#line 8060 "BatchImport.c" +#line 7640 "BatchImport.c" } #line 911 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp208_ = NULL; -#line 911 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp208_ = _data_->photo; #line 911 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp208_ != NULL) { #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp209_ = NULL; -#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp209_ = _data_->prepared_file; #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp210_ = NULL; -#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp210_ = _data_->_tmp209_->file; #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp211_ = NULL; -#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp211_ = g_file_get_path (_data_->_tmp210_); #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp212_ = NULL; -#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp212_ = _data_->_tmp211_; #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala" g_debug ("BatchImport.vala:912: duplicate photo found marked offline, marking on" \ @@ -8089,85 +7659,49 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_data_->_tmp212_); #line 915 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp213_ = NULL; -#line 915 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp213_ = _data_->photo; #line 915 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp214_ = NULL; -#line 915 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp214_ = _data_->prepared_file; #line 915 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp215_ = NULL; -#line 915 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp215_ = _data_->_tmp214_->file; #line 915 "/home/jens/Source/shotwell/src/BatchImport.vala" monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp213_, TYPE_MONITORABLE, Monitorable), _data_->_tmp215_); #line 916 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp216_ = NULL; -#line 916 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp216_ = _data_->photo; #line 916 "/home/jens/Source/shotwell/src/BatchImport.vala" media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp216_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 8108 "BatchImport.c" +#line 7670 "BatchImport.c" } } #line 920 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp217_ = NULL; -#line 920 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp217_ = _data_->photo; #line 920 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp217_ != NULL) { #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp218_ = NULL; -#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp218_ = _data_->prepared_file; #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp219_ = NULL; -#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp219_ = _data_->_tmp218_->job; #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp220_ = NULL; -#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp220_ = _data_->prepared_file; #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp221_ = NULL; -#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp221_ = _data_->_tmp220_->file; #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp222_ = NULL; -#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp222_ = _data_->prepared_file; #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp223_ = NULL; -#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp223_ = _data_->_tmp222_->file; #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp224_ = NULL; -#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp224_ = g_file_get_path (_data_->_tmp223_); #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp225_ = NULL; -#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp225_ = _data_->_tmp224_; #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp226_ = NULL; -#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp226_ = _data_->prepared_file; #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp227_ = NULL; -#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp227_ = _data_->_tmp226_->file; #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp228_ = NULL; -#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp228_ = g_file_get_path (_data_->_tmp227_); #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp229_ = NULL; -#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp229_ = _data_->_tmp228_; #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp230_ = NULL; -#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp230_ = batch_import_result_new (_data_->_tmp219_, _data_->_tmp221_, _data_->_tmp225_, _data_->_tmp229_, NULL, IMPORT_RESULT_SUCCESS); #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (_data_->import_result); @@ -8178,36 +7712,22 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_data_->_tmp225_); #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp231_ = NULL; -#line 925 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp231_ = _data_->self->priv->manifest; #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp232_ = NULL; -#line 925 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp232_ = _data_->_tmp231_->imported; #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp233_ = NULL; -#line 925 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp233_ = _data_->photo; #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp232_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp233_, TYPE_MEDIA_SOURCE, MediaSource)); #line 926 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp234_ = NULL; -#line 926 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp234_ = _data_->self->priv->manifest; #line 926 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp235_ = NULL; -#line 926 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp235_ = _data_->import_result; #line 926 "/home/jens/Source/shotwell/src/BatchImport.vala" import_manifest_add_result (_data_->_tmp234_, _data_->_tmp235_); #line 928 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp236_ = NULL; -#line 928 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp236_ = _data_->photo; #line 928 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp237_ = 0ULL; -#line 928 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp237_ = media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp236_, TYPE_MEDIA_SOURCE, MediaSource)); #line 928 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_report_progress (_data_->self, _data_->_tmp237_); @@ -8223,169 +7743,93 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar _prepared_file_unref0 (_data_->prepared_file); #line 931 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 8223 "BatchImport.c" +#line 7743 "BatchImport.c" } #line 934 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp238_ = NULL; -#line 934 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp238_ = _data_->prepared_file; #line 934 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp239_ = NULL; -#line 934 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp239_ = _data_->_tmp238_->file; #line 934 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp240_ = NULL; -#line 934 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp240_ = g_file_get_path (_data_->_tmp239_); #line 934 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp241_ = NULL; -#line 934 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp241_ = _data_->_tmp240_; #line 934 "/home/jens/Source/shotwell/src/BatchImport.vala" g_debug ("BatchImport.vala:934: duplicate photo detected, not importing %s", _data_->_tmp241_); #line 934 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_data_->_tmp241_); #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp242_ = NULL; -#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp242_ = photo_table_get_instance (); #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp243_ = NULL; -#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp243_ = _data_->_tmp242_; #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp244_ = NULL; -#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp244_ = _data_->prepared_file; #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp245_ = NULL; -#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp245_ = _data_->_tmp244_->file; #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp246_ = NULL; -#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp246_ = _data_->prepared_file; #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp247_ = NULL; -#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp247_ = _data_->_tmp246_->full_md5; #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp248_ = NULL; -#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp248_ = _data_->prepared_file; #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp249_ = 0; -#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp249_ = _data_->_tmp248_->file_format; #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp250_ = 0; -#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp251_ = NULL; -#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp251_ = photo_table_get_duplicate_ids (_data_->_tmp243_, _data_->_tmp245_, NULL, _data_->_tmp247_, _data_->_tmp249_, &_data_->_tmp250_); #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp252_ = NULL; -#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp252__length1 = 0; -#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp252_ = _data_->_tmp251_; #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp252__length1 = _data_->_tmp250_; #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" _database_table_unref0 (_data_->_tmp243_); #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->photo_ids_length1 = 0; -#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_photo_ids_size_ = 0; -#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->photo_ids = _data_->_tmp252_; #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->photo_ids_length1 = _data_->_tmp252__length1; #line 936 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_photo_ids_size_ = _data_->photo_ids_length1; #line 939 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp253_ = NULL; -#line 939 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp253__length1 = 0; -#line 939 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp253_ = _data_->photo_ids; #line 939 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp253__length1 = _data_->photo_ids_length1; #line 939 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (_data_->_tmp253__length1 > 0, "photo_ids.length > 0"); #line 941 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp254_ = NULL; -#line 941 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp254__length1 = 0; -#line 941 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp254_ = _data_->photo_ids; #line 941 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp254__length1 = _data_->photo_ids_length1; #line 941 "/home/jens/Source/shotwell/src/BatchImport.vala" - memset (&_data_->_tmp255_, 0, sizeof (PhotoID)); -#line 941 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp255_ = _data_->_tmp254_[0]; #line 941 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp256_ = NULL; -#line 941 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp256_ = duplicated_file_create_from_photo_id (&_data_->_tmp255_); #line 941 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_vala1_duplicated_file = _data_->_tmp256_; #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp257_ = NULL; -#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp257_ = _data_->prepared_file; #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp258_ = NULL; -#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp258_ = _data_->_tmp257_->job; #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp259_ = NULL; -#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp259_ = _data_->prepared_file; #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp260_ = NULL; -#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp260_ = _data_->_tmp259_->file; #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp261_ = NULL; -#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp261_ = _data_->prepared_file; #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp262_ = NULL; -#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp262_ = _data_->_tmp261_->file; #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp263_ = NULL; -#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp263_ = g_file_get_path (_data_->_tmp262_); #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp264_ = NULL; -#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp264_ = _data_->_tmp263_; #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp265_ = NULL; -#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp265_ = _data_->prepared_file; #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp266_ = NULL; -#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp266_ = _data_->_tmp265_->file; #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp267_ = NULL; -#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp267_ = g_file_get_path (_data_->_tmp266_); #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp268_ = NULL; -#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp268_ = _data_->_tmp267_; #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp269_ = NULL; -#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp269_ = _data_->_vala1_duplicated_file; #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp270_ = NULL; -#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp270_ = batch_import_result_new (_data_->_tmp258_, _data_->_tmp260_, _data_->_tmp264_, _data_->_tmp268_, _data_->_tmp269_, IMPORT_RESULT_PHOTO_EXISTS); #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (_data_->import_result); @@ -8399,18 +7843,14 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar _g_object_unref0 (_data_->_vala1_duplicated_file); #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->photo_ids = (g_free (_data_->photo_ids), NULL); -#line 8399 "BatchImport.c" +#line 7843 "BatchImport.c" } } #line 948 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp271_ = NULL; -#line 948 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp271_ = _data_->import_result; #line 948 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_data_->_tmp271_ != NULL) { #line 949 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp272_ = NULL; -#line 949 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp272_ = _data_->import_result; #line 949 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_report_failure (_data_->self, _data_->_tmp272_); @@ -8426,17 +7866,13 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar _prepared_file_unref0 (_data_->prepared_file); #line 952 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 8426 "BatchImport.c" +#line 7866 "BatchImport.c" } #line 955 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_report_progress (_data_->self, (guint64) 0); #line 956 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp273_ = NULL; -#line 956 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp273_ = _data_->self->priv->ready_files; #line 956 "/home/jens/Source/shotwell/src/BatchImport.vala" - _data_->_tmp274_ = NULL; -#line 956 "/home/jens/Source/shotwell/src/BatchImport.vala" _data_->_tmp274_ = _data_->prepared_file; #line 956 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp273_, GEE_TYPE_COLLECTION, GeeCollection), _data_->_tmp274_); @@ -8448,45 +7884,46 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar _batch_import_result_unref0 (_data_->import_result); #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_data_->prepared_file); -#line 8448 "BatchImport.c" +#line 7884 "BatchImport.c" } #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_data_->_prepared_file_list); -#line 8452 "BatchImport.c" +#line 7888 "BatchImport.c" } #line 959 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_flush_import_jobs (_data_->self); #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_data_->_state_ == 0) { + g_task_return_pointer (_data_->_async_result, _data_, NULL); #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 8460 "BatchImport.c" - } else { + if (_data_->_state_ != 0) { +#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala" + while (_data_->_task_complete_ != TRUE) { #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 8464 "BatchImport.c" + g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); +#line 7900 "BatchImport.c" + } } #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala" g_object_unref (_data_->_async_result); #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala" return FALSE; -#line 8470 "BatchImport.c" +#line 7907 "BatchImport.c" } static void batch_import_done_preparing_files (BatchImport* self, BackgroundJob* j, const gchar* caller) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; PrepareFilesJob* prepare_files_job = NULL; - BackgroundJob* _tmp1_ = NULL; - PrepareFilesJob* _tmp2_ = NULL; - PrepareFilesJob* _tmp3_ = NULL; - PrepareFilesJob* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; - const gchar* _tmp8_ = NULL; + BackgroundJob* _tmp1_; + PrepareFilesJob* _tmp2_; + PrepareFilesJob* _tmp3_; + PrepareFilesJob* _tmp4_; + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; + const gchar* _tmp8_; gboolean _tmp9_ = FALSE; - gint _tmp10_ = 0; + gint _tmp10_; #line 962 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 962 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -8529,60 +7966,60 @@ static void batch_import_done_preparing_files (BatchImport* self, BackgroundJob* _tmp10_ = self->priv->file_imports_to_perform; #line 980 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp10_ == 0) { -#line 8529 "BatchImport.c" - gboolean _tmp11_ = FALSE; +#line 7966 "BatchImport.c" + gboolean _tmp11_; #line 980 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = self->priv->completed; #line 980 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = !_tmp11_; -#line 8535 "BatchImport.c" +#line 7972 "BatchImport.c" } else { #line 980 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = FALSE; -#line 8539 "BatchImport.c" +#line 7976 "BatchImport.c" } #line 980 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp9_) { #line 981 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_report_completed (self, "no files prepared for import"); -#line 8545 "BatchImport.c" +#line 7982 "BatchImport.c" } else { gboolean _tmp12_ = FALSE; - gint _tmp13_ = 0; - gint _tmp14_ = 0; + gint _tmp13_; + gint _tmp14_; #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = self->priv->file_imports_completed; #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = self->priv->file_imports_to_perform; #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp13_ == _tmp14_) { -#line 8556 "BatchImport.c" - gboolean _tmp15_ = FALSE; +#line 7993 "BatchImport.c" + gboolean _tmp15_; #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp15_ = self->priv->completed; #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = !_tmp15_; -#line 8562 "BatchImport.c" +#line 7999 "BatchImport.c" } else { #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = FALSE; -#line 8566 "BatchImport.c" +#line 8003 "BatchImport.c" } #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp12_) { #line 983 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_report_completed (self, "completed preparing files, all outstanding imports completed"); -#line 8572 "BatchImport.c" +#line 8009 "BatchImport.c" } } #line 962 "/home/jens/Source/shotwell/src/BatchImport.vala" _background_job_unref0 (prepare_files_job); -#line 8577 "BatchImport.c" +#line 8014 "BatchImport.c" } static void batch_import_on_files_prepared (BatchImport* self, BackgroundJob* j) { - BackgroundJob* _tmp0_ = NULL; + BackgroundJob* _tmp0_; #line 986 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 986 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -8591,12 +8028,12 @@ static void batch_import_on_files_prepared (BatchImport* self, BackgroundJob* j) _tmp0_ = j; #line 987 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_done_preparing_files (self, _tmp0_, "on_files_prepared"); -#line 8591 "BatchImport.c" +#line 8028 "BatchImport.c" } static void batch_import_on_file_prepare_cancelled (BatchImport* self, BackgroundJob* j) { - BackgroundJob* _tmp0_ = NULL; + BackgroundJob* _tmp0_; #line 990 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 990 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -8605,21 +8042,21 @@ static void batch_import_on_file_prepare_cancelled (BatchImport* self, Backgroun _tmp0_ = j; #line 991 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_done_preparing_files (self, _tmp0_, "on_file_prepare_cancelled"); -#line 8605 "BatchImport.c" +#line 8042 "BatchImport.c" } static void batch_import_on_import_files_completed (BatchImport* self, BackgroundJob* j) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; PreparedFileImportJob* job = NULL; - BackgroundJob* _tmp1_ = NULL; - PreparedFileImportJob* _tmp2_ = NULL; - PreparedFileImportJob* _tmp3_ = NULL; - PreparedFile* _tmp4_ = NULL; - PreparedFileImportJob* _tmp5_ = NULL; - BatchImportResult* _tmp6_ = NULL; - PreparedFileImportJob* _tmp12_ = NULL; - ReadyForImport* _tmp13_ = NULL; + BackgroundJob* _tmp1_; + PreparedFileImportJob* _tmp2_; + PreparedFileImportJob* _tmp3_; + PreparedFile* _tmp4_; + PreparedFileImportJob* _tmp5_; + BatchImportResult* _tmp6_; + PreparedFileImportJob* _tmp12_; + ReadyForImport* _tmp13_; GError * _inner_error_ = NULL; #line 998 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); @@ -8649,12 +8086,12 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun _tmp6_ = _tmp5_->failed; #line 1009 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp6_ != NULL) { -#line 8649 "BatchImport.c" - PreparedFileImportJob* _tmp7_ = NULL; - BatchImportResult* _tmp8_ = NULL; - ImportResult _tmp9_ = 0; - PreparedFileImportJob* _tmp10_ = NULL; - BatchImportResult* _tmp11_ = NULL; +#line 8086 "BatchImport.c" + PreparedFileImportJob* _tmp7_; + BatchImportResult* _tmp8_; + ImportResult _tmp9_; + PreparedFileImportJob* _tmp10_; + BatchImportResult* _tmp11_; #line 1010 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = job; #line 1010 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -8671,7 +8108,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun batch_import_report_failure (self, _tmp11_); #line 1013 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (self); -#line 8671 "BatchImport.c" +#line 8108 "BatchImport.c" } #line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = job; @@ -8679,26 +8116,26 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun _tmp13_ = _tmp12_->ready; #line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp13_ != NULL) { -#line 8679 "BatchImport.c" - PreparedFileImportJob* _tmp14_ = NULL; - ReadyForImport* _tmp15_ = NULL; - BatchImportResult* _tmp16_ = NULL; - ImportResult _tmp17_ = 0; +#line 8116 "BatchImport.c" + PreparedFileImportJob* _tmp14_; + ReadyForImport* _tmp15_; + BatchImportResult* _tmp16_; + ImportResult _tmp17_; Tombstone* tombstone = NULL; - TombstoneSourceCollection* _tmp18_ = NULL; - PreparedFileImportJob* _tmp19_ = NULL; - ReadyForImport* _tmp20_ = NULL; - GFile* _tmp21_ = NULL; - Tombstone* _tmp22_ = NULL; - Tombstone* _tmp23_ = NULL; + TombstoneSourceCollection* _tmp18_; + PreparedFileImportJob* _tmp19_; + ReadyForImport* _tmp20_; + GFile* _tmp21_; + Tombstone* _tmp22_; + Tombstone* _tmp23_; MediaSource* source = NULL; - PreparedFileImportJob* _tmp26_ = NULL; - ReadyForImport* _tmp27_ = NULL; - gboolean _tmp28_ = FALSE; - PreparedFileImportJob* _tmp87_ = NULL; - ReadyForImport* _tmp88_ = NULL; - BatchImportResult* _tmp89_ = NULL; - ImportResult _tmp90_ = 0; + PreparedFileImportJob* _tmp26_; + ReadyForImport* _tmp27_; + gboolean _tmp28_; + PreparedFileImportJob* _tmp87_; + ReadyForImport* _tmp88_; + BatchImportResult* _tmp89_; + ImportResult _tmp90_; #line 1019 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = job; #line 1019 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -8725,16 +8162,16 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun _tmp23_ = tombstone; #line 1022 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp23_ != NULL) { -#line 8725 "BatchImport.c" - TombstoneSourceCollection* _tmp24_ = NULL; - Tombstone* _tmp25_ = NULL; +#line 8162 "BatchImport.c" + TombstoneSourceCollection* _tmp24_; + Tombstone* _tmp25_; #line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp24_ = tombstone_global; #line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp25_ = tombstone; #line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala" tombstone_source_collection_resurrect (_tmp24_, _tmp25_); -#line 8734 "BatchImport.c" +#line 8171 "BatchImport.c" } #line 1026 "/home/jens/Source/shotwell/src/BatchImport.vala" source = NULL; @@ -8746,15 +8183,15 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun _tmp28_ = _tmp27_->is_video; #line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp28_) { -#line 8746 "BatchImport.c" - PreparedFileImportJob* _tmp29_ = NULL; - ReadyForImport* _tmp30_ = NULL; - BatchImportResult* _tmp31_ = NULL; - PreparedFileImportJob* _tmp32_ = NULL; - ReadyForImport* _tmp33_ = NULL; - VideoImportParams* _tmp34_ = NULL; +#line 8183 "BatchImport.c" + PreparedFileImportJob* _tmp29_; + ReadyForImport* _tmp30_; + BatchImportResult* _tmp31_; + PreparedFileImportJob* _tmp32_; + ReadyForImport* _tmp33_; + VideoImportParams* _tmp34_; Video* _tmp35_ = NULL; - ImportResult _tmp36_ = 0; + ImportResult _tmp36_; #line 1028 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp29_ = job; #line 1028 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -8775,25 +8212,25 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun source = G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE, MediaSource); #line 1028 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp31_->result = _tmp36_; -#line 8775 "BatchImport.c" +#line 8212 "BatchImport.c" } else { - PreparedFileImportJob* _tmp37_ = NULL; - ReadyForImport* _tmp38_ = NULL; - BatchImportResult* _tmp39_ = NULL; - PreparedFileImportJob* _tmp40_ = NULL; - ReadyForImport* _tmp41_ = NULL; - PhotoImportParams* _tmp42_ = NULL; + PreparedFileImportJob* _tmp37_; + ReadyForImport* _tmp38_; + BatchImportResult* _tmp39_; + PreparedFileImportJob* _tmp40_; + ReadyForImport* _tmp41_; + PhotoImportParams* _tmp42_; LibraryPhoto* _tmp43_ = NULL; - ImportResult _tmp44_ = 0; + ImportResult _tmp44_; Photo* photo = NULL; - MediaSource* _tmp45_ = NULL; - Photo* _tmp46_ = NULL; - PreparedFileImportJob* _tmp47_ = NULL; - ReadyForImport* _tmp48_ = NULL; - PhotoImportParams* _tmp49_ = NULL; - GFile* _tmp50_ = NULL; - Photo* _tmp72_ = NULL; - PhotoFileFormat _tmp73_ = 0; + MediaSource* _tmp45_; + Photo* _tmp46_; + PreparedFileImportJob* _tmp47_; + ReadyForImport* _tmp48_; + PhotoImportParams* _tmp49_; + GFile* _tmp50_; + Photo* _tmp72_; + PhotoFileFormat _tmp73_; #line 1031 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp37_ = job; #line 1031 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -8830,23 +8267,23 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun _tmp50_ = _tmp49_->final_associated_file; #line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp50_ != NULL) { -#line 8830 "BatchImport.c" +#line 8267 "BatchImport.c" BackingPhotoRow* bpr = NULL; - BackingPhotoRow* _tmp51_ = NULL; - BackingPhotoRow* _tmp52_ = NULL; - BackingPhotoRow* _tmp53_ = NULL; - PreparedFileImportJob* _tmp54_ = NULL; - ReadyForImport* _tmp55_ = NULL; - PhotoImportParams* _tmp56_ = NULL; - GFile* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - MediaSource* _tmp59_ = NULL; - GFile* _tmp60_ = NULL; - GFile* _tmp61_ = NULL; - gchar* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; - BackingPhotoRow* _tmp64_ = NULL; - const gchar* _tmp65_ = NULL; + BackingPhotoRow* _tmp51_; + BackingPhotoRow* _tmp52_; + BackingPhotoRow* _tmp53_; + PreparedFileImportJob* _tmp54_; + ReadyForImport* _tmp55_; + PhotoImportParams* _tmp56_; + GFile* _tmp57_; + gchar* _tmp58_; + MediaSource* _tmp59_; + GFile* _tmp60_; + GFile* _tmp61_; + gchar* _tmp62_; + gchar* _tmp63_; + BackingPhotoRow* _tmp64_; + const gchar* _tmp65_; #line 1037 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp51_ = backing_photo_row_new (); #line 1037 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -8891,10 +8328,10 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun _g_free0 (_tmp63_); #line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp61_); -#line 8891 "BatchImport.c" +#line 8328 "BatchImport.c" { - MediaSource* _tmp66_ = NULL; - BackingPhotoRow* _tmp67_ = NULL; + MediaSource* _tmp66_; + BackingPhotoRow* _tmp67_; #line 1043 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp66_ = source; #line 1043 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -8903,18 +8340,18 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun photo_add_backing_photo_for_development (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_PHOTO, Photo), RAW_DEVELOPER_CAMERA, _tmp67_, &_inner_error_); #line 1043 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8903 "BatchImport.c" - goto __catch411_g_error; +#line 8340 "BatchImport.c" + goto __catch412_g_error; } } - goto __finally411; - __catch411_g_error: + goto __finally412; + __catch412_g_error: { GError* e = NULL; - BackingPhotoRow* _tmp68_ = NULL; - const gchar* _tmp69_ = NULL; - GError* _tmp70_ = NULL; - const gchar* _tmp71_ = NULL; + BackingPhotoRow* _tmp68_; + const gchar* _tmp69_; + GError* _tmp70_; + const gchar* _tmp71_; #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala" e = _inner_error_; #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -8932,9 +8369,9 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun "or: %s", _tmp69_, _tmp71_); #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (e); -#line 8931 "BatchImport.c" +#line 8368 "BatchImport.c" } - __finally411: + __finally412: #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -8953,11 +8390,11 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun g_clear_error (&_inner_error_); #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 8952 "BatchImport.c" +#line 8389 "BatchImport.c" } #line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala" _backing_photo_row_unref0 (bpr); -#line 8956 "BatchImport.c" +#line 8393 "BatchImport.c" } #line 1051 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp72_ = photo; @@ -8965,18 +8402,18 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun _tmp73_ = photo_get_master_file_format (_tmp72_); #line 1051 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp73_ == PHOTO_FILE_FORMAT_RAW) { -#line 8964 "BatchImport.c" +#line 8401 "BatchImport.c" RawDeveloper d = 0; - ConfigFacade* _tmp74_ = NULL; - ConfigFacade* _tmp75_ = NULL; - RawDeveloper _tmp76_ = 0; - RawDeveloper _tmp77_ = 0; + ConfigFacade* _tmp74_; + ConfigFacade* _tmp75_; + RawDeveloper _tmp76_; + RawDeveloper _tmp77_; gboolean _tmp78_ = FALSE; - RawDeveloper _tmp79_ = 0; - Photo* _tmp83_ = NULL; - RawDeveloper _tmp84_ = 0; - Photo* _tmp85_ = NULL; - RawDeveloper _tmp86_ = 0; + RawDeveloper _tmp79_; + Photo* _tmp83_; + RawDeveloper _tmp84_; + Photo* _tmp85_; + RawDeveloper _tmp86_; #line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp74_ = config_facade_get_instance (); #line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -8993,10 +8430,10 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun _tmp79_ = d; #line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp79_ == RAW_DEVELOPER_CAMERA) { -#line 8992 "BatchImport.c" - Photo* _tmp80_ = NULL; - RawDeveloper _tmp81_ = 0; - gboolean _tmp82_ = FALSE; +#line 8429 "BatchImport.c" + Photo* _tmp80_; + RawDeveloper _tmp81_; + gboolean _tmp82_; #line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp80_ = photo; #line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9005,17 +8442,17 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun _tmp82_ = photo_is_raw_developer_available (_tmp80_, _tmp81_); #line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp78_ = !_tmp82_; -#line 9004 "BatchImport.c" +#line 8441 "BatchImport.c" } else { #line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp78_ = FALSE; -#line 9008 "BatchImport.c" +#line 8445 "BatchImport.c" } #line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp78_) { #line 1054 "/home/jens/Source/shotwell/src/BatchImport.vala" d = RAW_DEVELOPER_EMBEDDED; -#line 9014 "BatchImport.c" +#line 8451 "BatchImport.c" } #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp83_ = photo; @@ -9029,11 +8466,11 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun _tmp86_ = d; #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala" photo_set_raw_developer (_tmp85_, _tmp86_); -#line 9028 "BatchImport.c" +#line 8465 "BatchImport.c" } #line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (photo); -#line 9032 "BatchImport.c" +#line 8469 "BatchImport.c" } #line 1061 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp87_ = job; @@ -9045,16 +8482,16 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun _tmp90_ = _tmp89_->result; #line 1061 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp90_ != IMPORT_RESULT_SUCCESS) { -#line 9044 "BatchImport.c" - PreparedFileImportJob* _tmp91_ = NULL; - ReadyForImport* _tmp92_ = NULL; - BatchImportResult* _tmp93_ = NULL; - ImportResult _tmp94_ = 0; - gchar* _tmp95_ = NULL; - gchar* _tmp96_ = NULL; - PreparedFileImportJob* _tmp97_ = NULL; - ReadyForImport* _tmp98_ = NULL; - BatchImportResult* _tmp99_ = NULL; +#line 8481 "BatchImport.c" + PreparedFileImportJob* _tmp91_; + ReadyForImport* _tmp92_; + BatchImportResult* _tmp93_; + ImportResult _tmp94_; + gchar* _tmp95_; + gchar* _tmp96_; + PreparedFileImportJob* _tmp97_; + ReadyForImport* _tmp98_; + BatchImportResult* _tmp99_; #line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp91_ = job; #line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9081,23 +8518,23 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun batch_import_report_failure (self, _tmp99_); #line 1065 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (self); -#line 9080 "BatchImport.c" +#line 8517 "BatchImport.c" } else { - GeeList* _tmp100_ = NULL; - MediaSource* _tmp101_ = NULL; - PreparedFileImportJob* _tmp102_ = NULL; - ReadyForImport* _tmp103_ = NULL; - Thumbnails* _tmp104_ = NULL; - Thumbnails* _tmp105_ = NULL; - PreparedFileImportJob* _tmp106_ = NULL; - ReadyForImport* _tmp107_ = NULL; - PreparedFile* _tmp108_ = NULL; - BatchImportJob* _tmp109_ = NULL; - PreparedFileImportJob* _tmp110_ = NULL; - ReadyForImport* _tmp111_ = NULL; - BatchImportResult* _tmp112_ = NULL; - CompletedImportObject* _tmp113_ = NULL; - CompletedImportObject* _tmp114_ = NULL; + GeeList* _tmp100_; + MediaSource* _tmp101_; + PreparedFileImportJob* _tmp102_; + ReadyForImport* _tmp103_; + Thumbnails* _tmp104_; + Thumbnails* _tmp105_; + PreparedFileImportJob* _tmp106_; + ReadyForImport* _tmp107_; + PreparedFile* _tmp108_; + BatchImportJob* _tmp109_; + PreparedFileImportJob* _tmp110_; + ReadyForImport* _tmp111_; + BatchImportResult* _tmp112_; + CompletedImportObject* _tmp113_; + CompletedImportObject* _tmp114_; #line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp100_ = self->priv->ready_thumbnails; #line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9134,33 +8571,33 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun _completed_import_object_unref0 (_tmp114_); #line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala" _thumbnails_unref0 (_tmp105_); -#line 9133 "BatchImport.c" +#line 8570 "BatchImport.c" } #line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (source); #line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (tombstone); -#line 9139 "BatchImport.c" +#line 8576 "BatchImport.c" } #line 1072 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_flush_import_jobs (self); #line 998 "/home/jens/Source/shotwell/src/BatchImport.vala" _background_job_unref0 (job); -#line 9145 "BatchImport.c" +#line 8582 "BatchImport.c" } static void batch_import_on_import_files_cancelled (BatchImport* self, BackgroundJob* j) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; PreparedFileImportJob* job = NULL; - BackgroundJob* _tmp1_ = NULL; - PreparedFileImportJob* _tmp2_ = NULL; - PreparedFileImportJob* _tmp3_ = NULL; - PreparedFile* _tmp4_ = NULL; - PreparedFileImportJob* _tmp23_ = NULL; - BatchImportResult* _tmp24_ = NULL; - PreparedFileImportJob* _tmp27_ = NULL; - ReadyForImport* _tmp28_ = NULL; + BackgroundJob* _tmp1_; + PreparedFileImportJob* _tmp2_; + PreparedFileImportJob* _tmp3_; + PreparedFile* _tmp4_; + PreparedFileImportJob* _tmp23_; + BatchImportResult* _tmp24_; + PreparedFileImportJob* _tmp27_; + ReadyForImport* _tmp28_; #line 1075 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 1075 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9183,25 +8620,25 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun _tmp4_ = _tmp3_->not_ready; #line 1082 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp4_ != NULL) { -#line 9182 "BatchImport.c" - PreparedFileImportJob* _tmp5_ = NULL; - PreparedFile* _tmp6_ = NULL; - BatchImportJob* _tmp7_ = NULL; - PreparedFileImportJob* _tmp8_ = NULL; - PreparedFile* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - PreparedFileImportJob* _tmp11_ = NULL; - PreparedFile* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - PreparedFileImportJob* _tmp16_ = NULL; - PreparedFile* _tmp17_ = NULL; - GFile* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - BatchImportResult* _tmp21_ = NULL; - BatchImportResult* _tmp22_ = NULL; +#line 8619 "BatchImport.c" + PreparedFileImportJob* _tmp5_; + PreparedFile* _tmp6_; + BatchImportJob* _tmp7_; + PreparedFileImportJob* _tmp8_; + PreparedFile* _tmp9_; + GFile* _tmp10_; + PreparedFileImportJob* _tmp11_; + PreparedFile* _tmp12_; + GFile* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + PreparedFileImportJob* _tmp16_; + PreparedFile* _tmp17_; + GFile* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; + BatchImportResult* _tmp21_; + BatchImportResult* _tmp22_; #line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = job; #line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9248,7 +8685,7 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun _g_free0 (_tmp15_); #line 1086 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (self); -#line 9247 "BatchImport.c" +#line 8684 "BatchImport.c" } #line 1089 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp23_ = job; @@ -9256,9 +8693,9 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun _tmp24_ = _tmp23_->failed; #line 1089 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp24_ != NULL) { -#line 9255 "BatchImport.c" - PreparedFileImportJob* _tmp25_ = NULL; - BatchImportResult* _tmp26_ = NULL; +#line 8692 "BatchImport.c" + PreparedFileImportJob* _tmp25_; + BatchImportResult* _tmp26_; #line 1090 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp25_ = job; #line 1090 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9267,7 +8704,7 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun batch_import_report_failure (self, _tmp26_); #line 1091 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (self); -#line 9266 "BatchImport.c" +#line 8703 "BatchImport.c" } #line 1094 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp27_ = job; @@ -9275,11 +8712,11 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun _tmp28_ = _tmp27_->ready; #line 1094 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp28_ != NULL) { -#line 9274 "BatchImport.c" - PreparedFileImportJob* _tmp29_ = NULL; - ReadyForImport* _tmp30_ = NULL; - BatchImportResult* _tmp31_ = NULL; - BatchImportResult* _tmp32_ = NULL; +#line 8711 "BatchImport.c" + PreparedFileImportJob* _tmp29_; + ReadyForImport* _tmp30_; + BatchImportResult* _tmp31_; + BatchImportResult* _tmp32_; #line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp29_ = job; #line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9294,35 +8731,35 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun _batch_import_result_unref0 (_tmp32_); #line 1096 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (self); -#line 9293 "BatchImport.c" +#line 8730 "BatchImport.c" } #line 1099 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_flush_import_jobs (self); #line 1075 "/home/jens/Source/shotwell/src/BatchImport.vala" _background_job_unref0 (job); -#line 9299 "BatchImport.c" +#line 8736 "BatchImport.c" } static gpointer _completed_import_object_ref0 (gpointer self) { #line 1113 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? completed_import_object_ref (self) : NULL; -#line 9306 "BatchImport.c" +#line 8743 "BatchImport.c" } static void batch_import_on_thumbnail_writer_completed (BatchImport* self, BackgroundJob* j) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; ThumbnailWriterJob* job = NULL; - BackgroundJob* _tmp1_ = NULL; - ThumbnailWriterJob* _tmp2_ = NULL; + BackgroundJob* _tmp1_; + ThumbnailWriterJob* _tmp2_; CompletedImportObject* completed = NULL; - ThumbnailWriterJob* _tmp3_ = NULL; - CompletedImportObject* _tmp4_ = NULL; - CompletedImportObject* _tmp5_ = NULL; - CompletedImportObject* _tmp6_ = NULL; - BatchImportResult* _tmp7_ = NULL; - ImportResult _tmp8_ = 0; + ThumbnailWriterJob* _tmp3_; + CompletedImportObject* _tmp4_; + CompletedImportObject* _tmp5_; + CompletedImportObject* _tmp6_; + BatchImportResult* _tmp7_; + ImportResult _tmp8_; #line 1109 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 1109 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9355,20 +8792,20 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg _tmp8_ = _tmp7_->result; #line 1117 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp8_ != IMPORT_RESULT_SUCCESS) { -#line 9354 "BatchImport.c" - CompletedImportObject* _tmp9_ = NULL; - MediaSource* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - CompletedImportObject* _tmp13_ = NULL; - BatchImportResult* _tmp14_ = NULL; - ImportResult _tmp15_ = 0; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - CompletedImportObject* _tmp18_ = NULL; - MediaSource* _tmp19_ = NULL; - CompletedImportObject* _tmp26_ = NULL; - BatchImportResult* _tmp27_ = NULL; +#line 8791 "BatchImport.c" + CompletedImportObject* _tmp9_; + MediaSource* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + CompletedImportObject* _tmp13_; + BatchImportResult* _tmp14_; + ImportResult _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + CompletedImportObject* _tmp18_; + MediaSource* _tmp19_; + CompletedImportObject* _tmp26_; + BatchImportResult* _tmp27_; #line 1118 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = completed; #line 1118 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9400,35 +8837,35 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg _tmp19_ = _tmp18_->source; #line 1121 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO)) { -#line 9398 "BatchImport.c" - CompletedImportObject* _tmp20_ = NULL; - MediaSource* _tmp21_ = NULL; +#line 8835 "BatchImport.c" + CompletedImportObject* _tmp20_; + MediaSource* _tmp21_; #line 1122 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp20_ = completed; #line 1122 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp21_ = _tmp20_->source; #line 1122 "/home/jens/Source/shotwell/src/BatchImport.vala" library_photo_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp21_) : NULL); -#line 9407 "BatchImport.c" +#line 8844 "BatchImport.c" } else { - CompletedImportObject* _tmp22_ = NULL; - MediaSource* _tmp23_ = NULL; + CompletedImportObject* _tmp22_; + MediaSource* _tmp23_; #line 1123 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp22_ = completed; #line 1123 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp23_ = _tmp22_->source; #line 1123 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, TYPE_VIDEO)) { -#line 9417 "BatchImport.c" - CompletedImportObject* _tmp24_ = NULL; - MediaSource* _tmp25_ = NULL; +#line 8854 "BatchImport.c" + CompletedImportObject* _tmp24_; + MediaSource* _tmp25_; #line 1124 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp24_ = completed; #line 1124 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp25_ = _tmp24_->source; #line 1124 "/home/jens/Source/shotwell/src/BatchImport.vala" video_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, TYPE_VIDEO) ? ((Video*) _tmp25_) : NULL); -#line 9426 "BatchImport.c" +#line 8863 "BatchImport.c" } } #line 1126 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9439,17 +8876,17 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg batch_import_report_failure (self, _tmp27_); #line 1127 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (self); -#line 9437 "BatchImport.c" +#line 8874 "BatchImport.c" } else { - ImportManifest* _tmp28_ = NULL; - GeeList* _tmp29_ = NULL; - CompletedImportObject* _tmp30_ = NULL; - MediaSource* _tmp31_ = NULL; - ImportManifest* _tmp32_ = NULL; - CompletedImportObject* _tmp33_ = NULL; - BatchImportResult* _tmp34_ = NULL; - GeeList* _tmp35_ = NULL; - CompletedImportObject* _tmp36_ = NULL; + ImportManifest* _tmp28_; + GeeList* _tmp29_; + CompletedImportObject* _tmp30_; + MediaSource* _tmp31_; + ImportManifest* _tmp32_; + CompletedImportObject* _tmp33_; + BatchImportResult* _tmp34_; + GeeList* _tmp35_; + CompletedImportObject* _tmp36_; #line 1129 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp28_ = self->priv->manifest; #line 1129 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9474,7 +8911,7 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg _tmp36_ = completed; #line 1132 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), _tmp36_); -#line 9472 "BatchImport.c" +#line 8909 "BatchImport.c" } #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_flush_import_jobs (self); @@ -9482,23 +8919,23 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg _completed_import_object_unref0 (completed); #line 1109 "/home/jens/Source/shotwell/src/BatchImport.vala" _background_job_unref0 (job); -#line 9480 "BatchImport.c" +#line 8917 "BatchImport.c" } static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, BackgroundJob* j) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; ThumbnailWriterJob* job = NULL; - BackgroundJob* _tmp1_ = NULL; - ThumbnailWriterJob* _tmp2_ = NULL; + BackgroundJob* _tmp1_; + ThumbnailWriterJob* _tmp2_; CompletedImportObject* completed = NULL; - ThumbnailWriterJob* _tmp3_ = NULL; - CompletedImportObject* _tmp4_ = NULL; - CompletedImportObject* _tmp5_ = NULL; - CompletedImportObject* _tmp6_ = NULL; - MediaSource* _tmp7_ = NULL; - CompletedImportObject* _tmp14_ = NULL; - BatchImportResult* _tmp15_ = NULL; + ThumbnailWriterJob* _tmp3_; + CompletedImportObject* _tmp4_; + CompletedImportObject* _tmp5_; + CompletedImportObject* _tmp6_; + MediaSource* _tmp7_; + CompletedImportObject* _tmp14_; + BatchImportResult* _tmp15_; #line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); #line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9529,35 +8966,35 @@ static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, Backg _tmp7_ = _tmp6_->source; #line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO)) { -#line 9527 "BatchImport.c" - CompletedImportObject* _tmp8_ = NULL; - MediaSource* _tmp9_ = NULL; +#line 8964 "BatchImport.c" + CompletedImportObject* _tmp8_; + MediaSource* _tmp9_; #line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = completed; #line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = _tmp8_->source; #line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala" library_photo_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp9_) : NULL); -#line 9536 "BatchImport.c" +#line 8973 "BatchImport.c" } else { - CompletedImportObject* _tmp10_ = NULL; - MediaSource* _tmp11_ = NULL; + CompletedImportObject* _tmp10_; + MediaSource* _tmp11_; #line 1148 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = completed; #line 1148 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = _tmp10_->source; #line 1148 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_VIDEO)) { -#line 9546 "BatchImport.c" - CompletedImportObject* _tmp12_ = NULL; - MediaSource* _tmp13_ = NULL; +#line 8983 "BatchImport.c" + CompletedImportObject* _tmp12_; + MediaSource* _tmp13_; #line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = completed; #line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = _tmp12_->source; #line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala" video_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_VIDEO) ? ((Video*) _tmp13_) : NULL); -#line 9555 "BatchImport.c" +#line 8992 "BatchImport.c" } } #line 1151 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9574,43 +9011,43 @@ static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, Backg _completed_import_object_unref0 (completed); #line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala" _background_job_unref0 (job); -#line 9572 "BatchImport.c" +#line 9009 "BatchImport.c" } static void batch_import_flush_ready_sources (BatchImport* self) { - GeeList* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - GeeList* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; + GeeList* _tmp0_; + gint _tmp1_; + gint _tmp2_; + GeeList* _tmp3_; + gint _tmp4_; + gint _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; GeeArrayList* all = NULL; - GeeArrayList* _tmp8_ = NULL; + GeeArrayList* _tmp8_; GeeArrayList* photos = NULL; - GeeArrayList* _tmp9_ = NULL; + GeeArrayList* _tmp9_; GeeArrayList* videos = NULL; - GeeArrayList* _tmp10_ = NULL; + GeeArrayList* _tmp10_; GeeHashMap* completion_list = NULL; - GeeHashMap* _tmp11_ = NULL; - MediaCollectionRegistry* _tmp41_ = NULL; - MediaCollectionRegistry* _tmp42_ = NULL; - EventSourceCollection* _tmp43_ = NULL; - TagSourceCollection* _tmp44_ = NULL; - LibraryPhotoSourceCollection* _tmp45_ = NULL; - GeeArrayList* _tmp46_ = NULL; - VideoSourceCollection* _tmp47_ = NULL; - GeeArrayList* _tmp48_ = NULL; - GeeArrayList* _tmp70_ = NULL; - BatchImportRoll* _tmp71_ = NULL; - ViewCollection* _tmp72_ = NULL; - TagSourceCollection* _tmp73_ = NULL; - EventSourceCollection* _tmp74_ = NULL; - MediaCollectionRegistry* _tmp75_ = NULL; - MediaCollectionRegistry* _tmp76_ = NULL; - GeeList* _tmp77_ = NULL; + GeeHashMap* _tmp11_; + MediaCollectionRegistry* _tmp41_; + MediaCollectionRegistry* _tmp42_; + EventSourceCollection* _tmp43_; + TagSourceCollection* _tmp44_; + LibraryPhotoSourceCollection* _tmp45_; + GeeArrayList* _tmp46_; + VideoSourceCollection* _tmp47_; + GeeArrayList* _tmp48_; + GeeArrayList* _tmp70_; + BatchImportRoll* _tmp71_; + ViewCollection* _tmp72_; + TagSourceCollection* _tmp73_; + EventSourceCollection* _tmp74_; + MediaCollectionRegistry* _tmp75_; + MediaCollectionRegistry* _tmp76_; + GeeList* _tmp77_; GError * _inner_error_ = NULL; #line 1161 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT (self)); @@ -9624,7 +9061,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) { if (_tmp2_ == 0) { #line 1163 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 9622 "BatchImport.c" +#line 9059 "BatchImport.c" } #line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = self->priv->ready_sources; @@ -9656,15 +9093,15 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _tmp11_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 1173 "/home/jens/Source/shotwell/src/BatchImport.vala" completion_list = _tmp11_; -#line 9654 "BatchImport.c" +#line 9091 "BatchImport.c" { GeeList* _completed_list = NULL; - GeeList* _tmp12_ = NULL; - GeeList* _tmp13_ = NULL; + GeeList* _tmp12_; + GeeList* _tmp13_; gint _completed_size = 0; - GeeList* _tmp14_ = NULL; - gint _tmp15_ = 0; - gint _tmp16_ = 0; + GeeList* _tmp14_; + gint _tmp15_; + gint _tmp16_; gint _completed_index = 0; #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = self->priv->ready_sources; @@ -9684,24 +9121,24 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _completed_index = -1; #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 9682 "BatchImport.c" - gint _tmp17_ = 0; - gint _tmp18_ = 0; - gint _tmp19_ = 0; +#line 9119 "BatchImport.c" + gint _tmp17_; + gint _tmp18_; + gint _tmp19_; CompletedImportObject* completed = NULL; - GeeList* _tmp20_ = NULL; - gint _tmp21_ = 0; - gpointer _tmp22_ = NULL; - GeeArrayList* _tmp23_ = NULL; - CompletedImportObject* _tmp24_ = NULL; - MediaSource* _tmp25_ = NULL; - CompletedImportObject* _tmp26_ = NULL; - MediaSource* _tmp27_ = NULL; - GeeHashMap* _tmp36_ = NULL; - CompletedImportObject* _tmp37_ = NULL; - MediaSource* _tmp38_ = NULL; - CompletedImportObject* _tmp39_ = NULL; - BatchImportJob* _tmp40_ = NULL; + GeeList* _tmp20_; + gint _tmp21_; + gpointer _tmp22_; + GeeArrayList* _tmp23_; + CompletedImportObject* _tmp24_; + MediaSource* _tmp25_; + CompletedImportObject* _tmp26_; + MediaSource* _tmp27_; + GeeHashMap* _tmp36_; + CompletedImportObject* _tmp37_; + MediaSource* _tmp38_; + CompletedImportObject* _tmp39_; + BatchImportJob* _tmp40_; #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp17_ = _completed_index; #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9714,7 +9151,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) { if (!(_tmp18_ < _tmp19_)) { #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 9712 "BatchImport.c" +#line 9149 "BatchImport.c" } #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp20_ = _completed_list; @@ -9738,10 +9175,10 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _tmp27_ = _tmp26_->source; #line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_LIBRARY_PHOTO)) { -#line 9736 "BatchImport.c" - GeeArrayList* _tmp28_ = NULL; - CompletedImportObject* _tmp29_ = NULL; - MediaSource* _tmp30_ = NULL; +#line 9173 "BatchImport.c" + GeeArrayList* _tmp28_; + CompletedImportObject* _tmp29_; + MediaSource* _tmp30_; #line 1179 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp28_ = photos; #line 1179 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9750,20 +9187,20 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _tmp30_ = _tmp29_->source; #line 1179 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 9748 "BatchImport.c" +#line 9185 "BatchImport.c" } else { - CompletedImportObject* _tmp31_ = NULL; - MediaSource* _tmp32_ = NULL; + CompletedImportObject* _tmp31_; + MediaSource* _tmp32_; #line 1180 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp31_ = completed; #line 1180 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp32_ = _tmp31_->source; #line 1180 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, TYPE_VIDEO)) { -#line 9758 "BatchImport.c" - GeeArrayList* _tmp33_ = NULL; - CompletedImportObject* _tmp34_ = NULL; - MediaSource* _tmp35_ = NULL; +#line 9195 "BatchImport.c" + GeeArrayList* _tmp33_; + CompletedImportObject* _tmp34_; + MediaSource* _tmp35_; #line 1181 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp33_ = videos; #line 1181 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9772,7 +9209,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _tmp35_ = _tmp34_->source; #line 1181 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_VIDEO, Video)); -#line 9770 "BatchImport.c" +#line 9207 "BatchImport.c" } } #line 1183 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9789,11 +9226,11 @@ static void batch_import_flush_ready_sources (BatchImport* self) { gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp38_, _tmp40_); #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala" _completed_import_object_unref0 (completed); -#line 9787 "BatchImport.c" +#line 9224 "BatchImport.c" } #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_completed_list); -#line 9791 "BatchImport.c" +#line 9228 "BatchImport.c" } #line 1186 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp41_ = media_collection_registry_get_instance (); @@ -9823,15 +9260,15 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _tmp48_ = videos; #line 1191 "/home/jens/Source/shotwell/src/BatchImport.vala" media_source_collection_import_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 9821 "BatchImport.c" +#line 9258 "BatchImport.c" { GeeIterator* _media_it = NULL; - GeeHashMap* _tmp49_ = NULL; - GeeSet* _tmp50_ = NULL; - GeeSet* _tmp51_ = NULL; - GeeSet* _tmp52_ = NULL; - GeeIterator* _tmp53_ = NULL; - GeeIterator* _tmp54_ = NULL; + GeeHashMap* _tmp49_; + GeeSet* _tmp50_; + GeeSet* _tmp51_; + GeeSet* _tmp52_; + GeeIterator* _tmp53_; + GeeIterator* _tmp54_; #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp49_ = completion_list; #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9850,12 +9287,12 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _media_it = _tmp54_; #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 9848 "BatchImport.c" - GeeIterator* _tmp55_ = NULL; - gboolean _tmp56_ = FALSE; +#line 9285 "BatchImport.c" + GeeIterator* _tmp55_; + gboolean _tmp56_; MediaSource* media = NULL; - GeeIterator* _tmp57_ = NULL; - gpointer _tmp58_ = NULL; + GeeIterator* _tmp57_; + gpointer _tmp58_; #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp55_ = _media_it; #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9864,7 +9301,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) { if (!_tmp56_) { #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 9862 "BatchImport.c" +#line 9299 "BatchImport.c" } #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp57_ = _media_it; @@ -9872,14 +9309,14 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _tmp58_ = gee_iterator_get (_tmp57_); #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala" media = (MediaSource*) _tmp58_; -#line 9870 "BatchImport.c" +#line 9307 "BatchImport.c" { - GeeHashMap* _tmp59_ = NULL; - MediaSource* _tmp60_ = NULL; - gpointer _tmp61_ = NULL; - BatchImportJob* _tmp62_ = NULL; - MediaSource* _tmp63_ = NULL; - BatchImportRoll* _tmp64_ = NULL; + GeeHashMap* _tmp59_; + MediaSource* _tmp60_; + gpointer _tmp61_; + BatchImportJob* _tmp62_; + MediaSource* _tmp63_; + BatchImportRoll* _tmp64_; #line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp59_ = completion_list; #line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9898,19 +9335,19 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _batch_import_job_unref0 (_tmp62_); #line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9896 "BatchImport.c" - goto __catch412_g_error; +#line 9333 "BatchImport.c" + goto __catch413_g_error; } } - goto __finally412; - __catch412_g_error: + goto __finally413; + __catch413_g_error: { GError* err = NULL; - MediaSource* _tmp65_ = NULL; - gchar* _tmp66_ = NULL; - gchar* _tmp67_ = NULL; - GError* _tmp68_ = NULL; - const gchar* _tmp69_ = NULL; + MediaSource* _tmp65_; + gchar* _tmp66_; + gchar* _tmp67_; + GError* _tmp68_; + const gchar* _tmp69_; #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9932,9 +9369,9 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _g_free0 (_tmp67_); #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 9929 "BatchImport.c" +#line 9366 "BatchImport.c" } - __finally412: + __finally413: #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9955,15 +9392,15 @@ static void batch_import_flush_ready_sources (BatchImport* self) { g_clear_error (&_inner_error_); #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 9952 "BatchImport.c" +#line 9389 "BatchImport.c" } #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (media); -#line 9956 "BatchImport.c" +#line 9393 "BatchImport.c" } #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_media_it); -#line 9960 "BatchImport.c" +#line 9397 "BatchImport.c" } #line 1204 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp70_ = all; @@ -10001,29 +9438,29 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _g_object_unref0 (photos); #line 1161 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (all); -#line 9998 "BatchImport.c" +#line 9435 "BatchImport.c" } static gboolean batch_import_display_imported_timer (BatchImport* self) { gboolean result = FALSE; - GeeList* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - GCancellable* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + GeeList* _tmp0_; + gint _tmp1_; + gint _tmp2_; + GCancellable* _tmp4_; + gboolean _tmp5_; gint total = 0; - GCancellable* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; - gint _tmp18_ = 0; - GeeList* _tmp19_ = NULL; - gint _tmp20_ = 0; - gint _tmp21_ = 0; - gint _tmp22_ = 0; - gboolean _tmp40_ = FALSE; - GeeList* _tmp41_ = NULL; - gint _tmp42_ = 0; - gint _tmp43_ = 0; + GCancellable* _tmp9_; + gboolean _tmp10_; + gint _tmp18_; + GeeList* _tmp19_; + gint _tmp20_; + gint _tmp21_; + gint _tmp22_; + gboolean _tmp47_ = FALSE; + GeeList* _tmp48_; + gint _tmp49_; + gint _tmp50_; #line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE); #line 1216 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10034,15 +9471,15 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) { _tmp2_ = _tmp1_; #line 1216 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp2_ == 0) { -#line 10031 "BatchImport.c" - gboolean _tmp3_ = FALSE; +#line 9468 "BatchImport.c" + gboolean _tmp3_; #line 1217 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = self->priv->completed; #line 1217 "/home/jens/Source/shotwell/src/BatchImport.vala" result = !_tmp3_; #line 1217 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10039 "BatchImport.c" +#line 9476 "BatchImport.c" } #line 1219 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = self->priv->cancellable; @@ -10050,10 +9487,10 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) { _tmp5_ = g_cancellable_is_cancelled (_tmp4_); #line 1219 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp5_) { -#line 10047 "BatchImport.c" - GeeList* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; +#line 9484 "BatchImport.c" + GeeList* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 1220 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = self->priv->display_imported_queue; #line 1220 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10062,7 +9499,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) { _tmp8_ = _tmp7_; #line 1220 "/home/jens/Source/shotwell/src/BatchImport.vala" g_debug ("BatchImport.vala:1220: Importing %d photos at once", _tmp8_); -#line 10059 "BatchImport.c" +#line 9496 "BatchImport.c" } #line 1222 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_log_status (self, "display_imported_timer"); @@ -10074,10 +9511,10 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) { _tmp10_ = g_cancellable_is_cancelled (_tmp9_); #line 1233 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!_tmp10_) { -#line 10071 "BatchImport.c" - GeeList* _tmp11_ = NULL; - gint _tmp12_ = 0; - gint _tmp13_ = 0; +#line 9508 "BatchImport.c" + GeeList* _tmp11_; + gint _tmp12_; + gint _tmp13_; #line 1234 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = self->priv->display_imported_queue; #line 1234 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10086,11 +9523,11 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) { _tmp13_ = _tmp12_; #line 1234 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp13_ > BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW) { -#line 10083 "BatchImport.c" - GeeList* _tmp14_ = NULL; - gint _tmp15_ = 0; - gint _tmp16_ = 0; - gint _tmp17_ = 0; +#line 9520 "BatchImport.c" + GeeList* _tmp14_; + gint _tmp15_; + gint _tmp16_; + gint _tmp17_; #line 1235 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = self->priv->display_imported_queue; #line 1235 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10101,12 +9538,12 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) { _tmp17_ = CLAMP ((_tmp16_ / BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW) + 2, 0, 16); #line 1235 "/home/jens/Source/shotwell/src/BatchImport.vala" total = 1 << _tmp17_; -#line 10098 "BatchImport.c" +#line 9535 "BatchImport.c" } } else { #line 1239 "/home/jens/Source/shotwell/src/BatchImport.vala" total = BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW; -#line 10103 "BatchImport.c" +#line 9540 "BatchImport.c" } #line 1242 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp18_ = total; @@ -10122,26 +9559,25 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) { total = _tmp22_; #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 10119 "BatchImport.c" - gint _tmp23_ = 0; +#line 9556 "BatchImport.c" + gint _tmp23_; CompletedImportObject* completed_object = NULL; - GeeList* _tmp24_ = NULL; - gpointer _tmp25_ = NULL; + GeeList* _tmp24_; + gpointer _tmp25_; GdkPixbuf* user_preview = NULL; - CompletedImportObject* _tmp26_ = NULL; - GdkPixbuf* _tmp27_ = NULL; - GdkPixbuf* _tmp28_ = NULL; - CompletedImportObject* _tmp29_ = NULL; - CompletedImportObject* _tmp30_ = NULL; - GeeList* _tmp31_ = NULL; - CompletedImportObject* _tmp32_ = NULL; - CompletedImportObject* _tmp33_ = NULL; - MediaSource* _tmp34_ = NULL; - GdkPixbuf* _tmp35_ = NULL; - gint _tmp36_ = 0; - CompletedImportObject* _tmp37_ = NULL; - MediaSource* _tmp38_ = NULL; - guint64 _tmp39_ = 0ULL; + CompletedImportObject* _tmp26_; + GdkPixbuf* _tmp27_; + GdkPixbuf* _tmp28_; + CompletedImportObject* _tmp29_; + CompletedImportObject* _tmp30_; + GeeList* _tmp31_; + CompletedImportObject* _tmp32_; + CompletedImportObject* _tmp33_; + MediaSource* _tmp34_; + GdkPixbuf* _tmp35_; + gint _tmp36_; + CompletedImportObject* _tmp37_; + MediaSource* _tmp38_; #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp23_ = total; #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10150,7 +9586,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) { if (!(_tmp23_ > 0)) { #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 10147 "BatchImport.c" +#line 9583 "BatchImport.c" } #line 1253 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp24_ = self->priv->display_imported_queue; @@ -10193,56 +9629,92 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) { #line 1267 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp36_ = total; #line 1267 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_emit_by_name (self, "imported", _tmp34_, _tmp35_, _tmp36_); -#line 1268 "/home/jens/Source/shotwell/src/BatchImport.vala" + g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORTED_SIGNAL], 0, _tmp34_, _tmp35_, _tmp36_); +#line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp37_ = completed_object; -#line 1268 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp38_ = _tmp37_->source; -#line 1268 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp39_ = media_source_get_filesize (_tmp38_); -#line 1268 "/home/jens/Source/shotwell/src/BatchImport.vala" - batch_import_report_progress (self, _tmp39_); -#line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala" + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp38_, TYPE_PHOTO_SOURCE)) { +#line 9633 "BatchImport.c" + PhotoSource* photo_source = NULL; + CompletedImportObject* _tmp39_; + MediaSource* _tmp40_; + PhotoSource* _tmp41_; + PhotoSource* _tmp42_; + guint64 _tmp43_; +#line 1271 "/home/jens/Source/shotwell/src/BatchImport.vala" + _tmp39_ = completed_object; +#line 1271 "/home/jens/Source/shotwell/src/BatchImport.vala" + _tmp40_ = _tmp39_->source; +#line 1271 "/home/jens/Source/shotwell/src/BatchImport.vala" + _tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, TYPE_PHOTO_SOURCE) ? ((PhotoSource*) _tmp40_) : NULL); +#line 1271 "/home/jens/Source/shotwell/src/BatchImport.vala" + photo_source = _tmp41_; +#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala" + _tmp42_ = photo_source; +#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala" + _tmp43_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_MEDIA_SOURCE, MediaSource)); +#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala" + batch_import_report_progress (self, _tmp43_); +#line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala" + _g_object_unref0 (photo_source); +#line 9656 "BatchImport.c" + } else { + CompletedImportObject* _tmp44_; + MediaSource* _tmp45_; + guint64 _tmp46_; +#line 1274 "/home/jens/Source/shotwell/src/BatchImport.vala" + _tmp44_ = completed_object; +#line 1274 "/home/jens/Source/shotwell/src/BatchImport.vala" + _tmp45_ = _tmp44_->source; +#line 1274 "/home/jens/Source/shotwell/src/BatchImport.vala" + _tmp46_ = media_source_get_filesize (_tmp45_); +#line 1274 "/home/jens/Source/shotwell/src/BatchImport.vala" + batch_import_report_progress (self, _tmp46_); +#line 9669 "BatchImport.c" + } +#line 1276 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_file_import_complete (self); #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (user_preview); #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala" _completed_import_object_unref0 (completed_object); -#line 10205 "BatchImport.c" +#line 9677 "BatchImport.c" } -#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp41_ = self->priv->ready_sources; -#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp42_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp43_ = _tmp42_; -#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp43_ >= BATCH_IMPORT_READY_SOURCES_COUNT_OVERFLOW) { -#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp40_ = TRUE; -#line 10217 "BatchImport.c" +#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala" + _tmp48_ = self->priv->ready_sources; +#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala" + _tmp49_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala" + _tmp50_ = _tmp49_; +#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala" + if (_tmp50_ >= BATCH_IMPORT_READY_SOURCES_COUNT_OVERFLOW) { +#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala" + _tmp47_ = TRUE; +#line 9689 "BatchImport.c" } else { - GCancellable* _tmp44_ = NULL; - gboolean _tmp45_ = FALSE; -#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp44_ = self->priv->cancellable; -#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp45_ = g_cancellable_is_cancelled (_tmp44_); -#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp40_ = _tmp45_; -#line 10227 "BatchImport.c" + GCancellable* _tmp51_; + gboolean _tmp52_; +#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala" + _tmp51_ = self->priv->cancellable; +#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala" + _tmp52_ = g_cancellable_is_cancelled (_tmp51_); +#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala" + _tmp47_ = _tmp52_; +#line 9699 "BatchImport.c" } -#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala" - if (_tmp40_) { -#line 1273 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala" + if (_tmp47_) { +#line 1280 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_flush_ready_sources (self); -#line 10233 "BatchImport.c" +#line 9705 "BatchImport.c" } -#line 1275 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1282 "/home/jens/Source/shotwell/src/BatchImport.vala" result = TRUE; -#line 1275 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1282 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10239 "BatchImport.c" +#line 9711 "BatchImport.c" } @@ -10261,19 +9733,19 @@ static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GVa data1 = closure->data; #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = param_values->data[0].v_pointer; -#line 10258 "BatchImport.c" +#line 9730 "BatchImport.c" } else { #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" data1 = param_values->data[0].v_pointer; #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = closure->data; -#line 10264 "BatchImport.c" +#line 9736 "BatchImport.c" } #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" callback = (GMarshalFunc_VOID__UINT64_UINT64) (marshal_data ? marshal_data : cc->callback); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" callback (data1, g_value_get_uint64 (param_values + 1), g_value_get_uint64 (param_values + 2), data2); -#line 10270 "BatchImport.c" +#line 9742 "BatchImport.c" } @@ -10292,19 +9764,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT (GClosure * closure, data1 = closure->data; #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = param_values->data[0].v_pointer; -#line 10289 "BatchImport.c" +#line 9761 "BatchImport.c" } else { #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" data1 = param_values->data[0].v_pointer; #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = closure->data; -#line 10295 "BatchImport.c" +#line 9767 "BatchImport.c" } #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_INT) (marshal_data ? marshal_data : cc->callback); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_int (param_values + 3), data2); -#line 10301 "BatchImport.c" +#line 9773 "BatchImport.c" } @@ -10323,19 +9795,19 @@ static void g_cclosure_user_marshal_VOID__ENUM_STRING (GClosure * closure, GValu data1 = closure->data; #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = param_values->data[0].v_pointer; -#line 10320 "BatchImport.c" +#line 9792 "BatchImport.c" } else { #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" data1 = param_values->data[0].v_pointer; #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = closure->data; -#line 10326 "BatchImport.c" +#line 9798 "BatchImport.c" } #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" callback = (GMarshalFunc_VOID__ENUM_STRING) (marshal_data ? marshal_data : cc->callback); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" callback (data1, g_value_get_enum (param_values + 1), g_value_get_string (param_values + 2), data2); -#line 10332 "BatchImport.c" +#line 9804 "BatchImport.c" } @@ -10354,19 +9826,19 @@ static void g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT (GClosure * closur data1 = closure->data; #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = param_values->data[0].v_pointer; -#line 10351 "BatchImport.c" +#line 9823 "BatchImport.c" } else { #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" data1 = param_values->data[0].v_pointer; #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = closure->data; -#line 10357 "BatchImport.c" +#line 9829 "BatchImport.c" } #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" callback = (GMarshalFunc_VOID__BATCH_IMPORT_RESULT) (marshal_data ? marshal_data : cc->callback); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" callback (data1, value_get_batch_import_result (param_values + 1), data2); -#line 10363 "BatchImport.c" +#line 9835 "BatchImport.c" } @@ -10385,26 +9857,26 @@ static void g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL (GCl data1 = closure->data; #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = param_values->data[0].v_pointer; -#line 10382 "BatchImport.c" +#line 9854 "BatchImport.c" } else { #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" data1 = param_values->data[0].v_pointer; #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" data2 = closure->data; -#line 10388 "BatchImport.c" +#line 9860 "BatchImport.c" } #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" callback = (GMarshalFunc_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL) (marshal_data ? marshal_data : cc->callback); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" callback (data1, value_get_import_manifest (param_values + 1), value_get_batch_import_roll (param_values + 2), data2); -#line 10394 "BatchImport.c" +#line 9866 "BatchImport.c" } static void batch_import_class_init (BatchImportClass * klass) { - Workers* _tmp0_ = NULL; - guint _tmp1_ = 0U; - Workers* _tmp2_ = NULL; + Workers* _tmp0_; + guint _tmp1_; + Workers* _tmp2_; #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_parent_class = g_type_class_peek_parent (klass); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10412,19 +9884,19 @@ static void batch_import_class_init (BatchImportClass * klass) { #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" G_OBJECT_CLASS (klass)->finalize = batch_import_finalize; #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_new ("starting", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + batch_import_signals[BATCH_IMPORT_STARTING_SIGNAL] = g_signal_new ("starting", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_new ("preparing", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + batch_import_signals[BATCH_IMPORT_PREPARING_SIGNAL] = g_signal_new ("preparing", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_new ("progress", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT64_UINT64, G_TYPE_NONE, 2, G_TYPE_UINT64, G_TYPE_UINT64); + batch_import_signals[BATCH_IMPORT_PROGRESS_SIGNAL] = g_signal_new ("progress", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT64_UINT64, G_TYPE_NONE, 2, G_TYPE_UINT64, G_TYPE_UINT64); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_new ("imported", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, gdk_pixbuf_get_type (), G_TYPE_INT); + batch_import_signals[BATCH_IMPORT_IMPORTED_SIGNAL] = g_signal_new ("imported", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, gdk_pixbuf_get_type (), G_TYPE_INT); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_new ("fatal_error", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__ENUM_STRING, G_TYPE_NONE, 2, TYPE_IMPORT_RESULT, G_TYPE_STRING); + batch_import_signals[BATCH_IMPORT_FATAL_ERROR_SIGNAL] = g_signal_new ("fatal-error", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__ENUM_STRING, G_TYPE_NONE, 2, TYPE_IMPORT_RESULT, G_TYPE_STRING); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_new ("import_job_failed", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT_RESULT); + batch_import_signals[BATCH_IMPORT_IMPORT_JOB_FAILED_SIGNAL] = g_signal_new ("import-job-failed", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT_RESULT); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_new ("import_complete", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL, G_TYPE_NONE, 2, TYPE_IMPORT_MANIFEST, TYPE_BATCH_IMPORT_ROLL); + batch_import_signals[BATCH_IMPORT_IMPORT_COMPLETE_SIGNAL] = g_signal_new ("import-complete", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL, G_TYPE_NONE, 2, TYPE_IMPORT_MANIFEST, TYPE_BATCH_IMPORT_ROLL); #line 413 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = workers_new ((guint) 1, FALSE); #line 413 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10435,17 +9907,17 @@ static void batch_import_class_init (BatchImportClass * klass) { _tmp2_ = workers_new (_tmp1_, FALSE); #line 414 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_import_import_workers = _tmp2_; -#line 10432 "BatchImport.c" +#line 9904 "BatchImport.c" } static void batch_import_instance_init (BatchImport * self) { - GeeHashMap* _tmp0_ = NULL; - guint _tmp1_ = 0U; - GeeLinkedList* _tmp2_ = NULL; - GeeLinkedList* _tmp3_ = NULL; - GeeLinkedList* _tmp4_ = NULL; - GeeLinkedList* _tmp5_ = NULL; + GeeHashMap* _tmp0_; + guint _tmp1_; + GeeLinkedList* _tmp2_; + GeeLinkedList* _tmp3_; + GeeLinkedList* _tmp4_; + GeeLinkedList* _tmp5_; #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv = BATCH_IMPORT_GET_PRIVATE (self); #line 419 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10494,15 +9966,15 @@ static void batch_import_instance_init (BatchImport * self) { _tmp5_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL); #line 445 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->ready_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList); -#line 10491 "BatchImport.c" +#line 9963 "BatchImport.c" } -static void batch_import_finalize (GObject* obj) { +static void batch_import_finalize (GObject * obj) { BatchImport * self; - Application* _tmp0_ = NULL; - Application* _tmp1_ = NULL; - guint _tmp2_ = 0U; + Application* _tmp0_; + Application* _tmp1_; + guint _tmp2_; #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT, BatchImport); #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10539,7 +10011,7 @@ static void batch_import_finalize (GObject* obj) { _g_object_unref0 (self->priv->ready_sources); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" G_OBJECT_CLASS (batch_import_parent_class)->finalize (obj); -#line 10536 "BatchImport.c" +#line 10008 "BatchImport.c" } @@ -10557,256 +10029,256 @@ GType batch_import_get_type (void) { static DuplicatedFile* duplicated_file_construct (GType object_type) { DuplicatedFile * self = NULL; -#line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (DuplicatedFile*) g_object_new (object_type, NULL); -#line 1285 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1292 "/home/jens/Source/shotwell/src/BatchImport.vala" _video_id_free0 (self->priv->video_id); -#line 1285 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1292 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->video_id = NULL; -#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1293 "/home/jens/Source/shotwell/src/BatchImport.vala" _photo_id_free0 (self->priv->photo_id); -#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1293 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->photo_id = NULL; -#line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1294 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->file); -#line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1294 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->file = NULL; -#line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 10570 "BatchImport.c" +#line 10042 "BatchImport.c" } static DuplicatedFile* duplicated_file_new (void) { -#line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala" return duplicated_file_construct (TYPE_DUPLICATED_FILE); -#line 10577 "BatchImport.c" +#line 10049 "BatchImport.c" } static gpointer _photo_id_dup0 (gpointer self) { -#line 1294 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? photo_id_dup (self) : NULL; -#line 10584 "BatchImport.c" +#line 10056 "BatchImport.c" } DuplicatedFile* duplicated_file_create_from_photo_id (PhotoID* photo_id) { DuplicatedFile* result = NULL; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; DuplicatedFile* _result_ = NULL; - DuplicatedFile* _tmp1_ = NULL; - PhotoID _tmp2_ = {0}; - PhotoID* _tmp3_ = NULL; -#line 1290 "/home/jens/Source/shotwell/src/BatchImport.vala" + DuplicatedFile* _tmp1_; + PhotoID _tmp2_; + PhotoID* _tmp3_; +#line 1297 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (photo_id != NULL, NULL); -#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1298 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = photo_id_is_valid (photo_id); -#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1298 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (_tmp0_, "photo_id.is_valid()"); -#line 1293 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1300 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = duplicated_file_new (); -#line 1293 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1300 "/home/jens/Source/shotwell/src/BatchImport.vala" _result_ = _tmp1_; -#line 1294 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = *photo_id; -#line 1294 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = _photo_id_dup0 (&_tmp2_); -#line 1294 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala" _photo_id_free0 (_result_->priv->photo_id); -#line 1294 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala" _result_->priv->photo_id = _tmp3_; -#line 1295 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1302 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _result_; -#line 1295 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1302 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10617 "BatchImport.c" +#line 10089 "BatchImport.c" } static gpointer _video_id_dup0 (gpointer self) { -#line 1302 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? video_id_dup (self) : NULL; -#line 10624 "BatchImport.c" +#line 10096 "BatchImport.c" } DuplicatedFile* duplicated_file_create_from_video_id (VideoID* video_id) { DuplicatedFile* result = NULL; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; DuplicatedFile* _result_ = NULL; - DuplicatedFile* _tmp1_ = NULL; - VideoID _tmp2_ = {0}; - VideoID* _tmp3_ = NULL; -#line 1298 "/home/jens/Source/shotwell/src/BatchImport.vala" + DuplicatedFile* _tmp1_; + VideoID _tmp2_; + VideoID* _tmp3_; +#line 1305 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (video_id != NULL, NULL); -#line 1299 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1306 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = video_id_is_valid (video_id); -#line 1299 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1306 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (_tmp0_, "video_id.is_valid()"); -#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1308 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = duplicated_file_new (); -#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1308 "/home/jens/Source/shotwell/src/BatchImport.vala" _result_ = _tmp1_; -#line 1302 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = *video_id; -#line 1302 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = _video_id_dup0 (&_tmp2_); -#line 1302 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala" _video_id_free0 (_result_->priv->video_id); -#line 1302 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala" _result_->priv->video_id = _tmp3_; -#line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1310 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _result_; -#line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1310 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10657 "BatchImport.c" +#line 10129 "BatchImport.c" } DuplicatedFile* duplicated_file_create_from_file (GFile* file) { DuplicatedFile* result = NULL; DuplicatedFile* _result_ = NULL; - DuplicatedFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; -#line 1306 "/home/jens/Source/shotwell/src/BatchImport.vala" + DuplicatedFile* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; +#line 1313 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 1307 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1314 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = duplicated_file_new (); -#line 1307 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1314 "/home/jens/Source/shotwell/src/BatchImport.vala" _result_ = _tmp0_; -#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = file; -#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_result_->priv->file); -#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala" _result_->priv->file = _tmp2_; -#line 1311 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _result_; -#line 1311 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10685 "BatchImport.c" +#line 10157 "BatchImport.c" } GFile* duplicated_file_get_file (DuplicatedFile* self) { GFile* result = NULL; - GFile* _tmp0_ = NULL; -#line 1314 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp0_; +#line 1321 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_DUPLICATED_FILE (self), NULL); -#line 1315 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = self->priv->file; -#line 1315 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp0_ != NULL) { -#line 10698 "BatchImport.c" - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; -#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 10170 "BatchImport.c" + GFile* _tmp1_; + GFile* _tmp2_; +#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = self->priv->file; -#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp2_; -#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10709 "BatchImport.c" +#line 10181 "BatchImport.c" } else { - PhotoID* _tmp3_ = NULL; -#line 1317 "/home/jens/Source/shotwell/src/BatchImport.vala" + PhotoID* _tmp3_; +#line 1324 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = self->priv->photo_id; -#line 1317 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1324 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp3_ != NULL) { -#line 10716 "BatchImport.c" +#line 10188 "BatchImport.c" Photo* photo_object = NULL; - LibraryPhotoSourceCollection* _tmp4_ = NULL; - PhotoID* _tmp5_ = NULL; - PhotoID _tmp6_ = {0}; - LibraryPhoto* _tmp7_ = NULL; - Photo* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; -#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala" + LibraryPhotoSourceCollection* _tmp4_; + PhotoID* _tmp5_; + PhotoID _tmp6_; + LibraryPhoto* _tmp7_; + Photo* _tmp8_; + GFile* _tmp9_; + GFile* _tmp10_; + GFile* _tmp11_; +#line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = library_photo_global; -#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = self->priv->photo_id; -#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = *_tmp5_; -#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = library_photo_source_collection_fetch (_tmp4_, &_tmp6_); -#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala" photo_object = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO, Photo); -#line 1319 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = photo_object; -#line 1319 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 1319 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->file); -#line 1319 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->file = _tmp9_; -#line 1320 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = self->priv->file; -#line 1320 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = _g_object_ref0 (_tmp10_); -#line 1320 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp11_; -#line 1320 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (photo_object); -#line 1320 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10754 "BatchImport.c" +#line 10226 "BatchImport.c" } else { - VideoID* _tmp12_ = NULL; -#line 1321 "/home/jens/Source/shotwell/src/BatchImport.vala" + VideoID* _tmp12_; +#line 1328 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = self->priv->video_id; -#line 1321 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1328 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp12_ != NULL) { -#line 10761 "BatchImport.c" +#line 10233 "BatchImport.c" Video* video_object = NULL; - VideoSourceCollection* _tmp13_ = NULL; - VideoID* _tmp14_ = NULL; - VideoID _tmp15_ = {0}; - Video* _tmp16_ = NULL; - Video* _tmp17_ = NULL; - GFile* _tmp18_ = NULL; - GFile* _tmp19_ = NULL; - GFile* _tmp20_ = NULL; -#line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala" + VideoSourceCollection* _tmp13_; + VideoID* _tmp14_; + VideoID _tmp15_; + Video* _tmp16_; + Video* _tmp17_; + GFile* _tmp18_; + GFile* _tmp19_; + GFile* _tmp20_; +#line 1329 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = video_global; -#line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1329 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = self->priv->video_id; -#line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1329 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp15_ = *_tmp14_; -#line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1329 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp16_ = video_source_collection_fetch (_tmp13_, &_tmp15_); -#line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1329 "/home/jens/Source/shotwell/src/BatchImport.vala" video_object = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_VIDEO, Video); -#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1330 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp17_ = video_object; -#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1330 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp18_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1330 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->file); -#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1330 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->file = _tmp18_; -#line 1324 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp19_ = self->priv->file; -#line 1324 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp20_ = _g_object_ref0 (_tmp19_); -#line 1324 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp20_; -#line 1324 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (video_object); -#line 1324 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10799 "BatchImport.c" +#line 10271 "BatchImport.c" } else { -#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1333 "/home/jens/Source/shotwell/src/BatchImport.vala" g_assert_not_reached (); -#line 10803 "BatchImport.c" +#line 10275 "BatchImport.c" } } } @@ -10814,36 +10286,36 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) { static void duplicated_file_class_init (DuplicatedFileClass * klass) { -#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala" duplicated_file_parent_class = g_type_class_peek_parent (klass); -#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_class_add_private (klass, sizeof (DuplicatedFilePrivate)); -#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala" G_OBJECT_CLASS (klass)->finalize = duplicated_file_finalize; -#line 10817 "BatchImport.c" +#line 10289 "BatchImport.c" } static void duplicated_file_instance_init (DuplicatedFile * self) { -#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv = DUPLICATED_FILE_GET_PRIVATE (self); -#line 10824 "BatchImport.c" +#line 10296 "BatchImport.c" } -static void duplicated_file_finalize (GObject* obj) { +static void duplicated_file_finalize (GObject * obj) { DuplicatedFile * self; -#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DUPLICATED_FILE, DuplicatedFile); -#line 1280 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala" _video_id_free0 (self->priv->video_id); -#line 1281 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1288 "/home/jens/Source/shotwell/src/BatchImport.vala" _photo_id_free0 (self->priv->photo_id); -#line 1282 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1289 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->file); -#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala" G_OBJECT_CLASS (duplicated_file_parent_class)->finalize (obj); -#line 10840 "BatchImport.c" +#line 10312 "BatchImport.c" } @@ -10861,302 +10333,302 @@ GType duplicated_file_get_type (void) { BackgroundImportJob* background_import_job_construct (GType object_type, BatchImport* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) { BackgroundImportJob* self = NULL; - BatchImport* _tmp0_ = NULL; - CompletionCallback _tmp1_ = NULL; - void* _tmp1__target = NULL; - GCancellable* _tmp2_ = NULL; - CancellationCallback _tmp3_ = NULL; - void* _tmp3__target = NULL; -#line 1353 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImport* _tmp0_; + CompletionCallback _tmp1_; + void* _tmp1__target; + GCancellable* _tmp2_; + CancellationCallback _tmp3_; + void* _tmp3__target; +#line 1360 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL); -#line 1353 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1360 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL); -#line 1355 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = owner; -#line 1355 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = callback; -#line 1355 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1__target = callback_target; -#line 1355 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = cancellable; -#line 1355 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = cancellation; -#line 1355 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3__target = cancellation_target; -#line 1355 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (BackgroundImportJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target, NULL); -#line 1353 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1360 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 10884 "BatchImport.c" +#line 10356 "BatchImport.c" } ImportResult background_import_job_abort_check (BackgroundImportJob* self) { ImportResult result = 0; gboolean _tmp0_ = FALSE; - ImportResult _tmp1_ = 0; - ImportResult _tmp3_ = 0; -#line 1360 "/home/jens/Source/shotwell/src/BatchImport.vala" + ImportResult _tmp1_; + ImportResult _tmp3_; +#line 1367 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BACKGROUND_IMPORT_JOB (self), 0); -#line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1368 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = self->abort_flag; -#line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1368 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp1_ == IMPORT_RESULT_SUCCESS) { -#line 10899 "BatchImport.c" - gboolean _tmp2_ = FALSE; -#line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 10371 "BatchImport.c" + gboolean _tmp2_; +#line 1368 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob)); -#line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1368 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp2_; -#line 10905 "BatchImport.c" +#line 10377 "BatchImport.c" } else { -#line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1368 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = FALSE; -#line 10909 "BatchImport.c" +#line 10381 "BatchImport.c" } -#line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1368 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp0_) { -#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1369 "/home/jens/Source/shotwell/src/BatchImport.vala" self->abort_flag = IMPORT_RESULT_USER_ABORT; -#line 10915 "BatchImport.c" +#line 10387 "BatchImport.c" } -#line 1364 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1371 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = self->abort_flag; -#line 1364 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1371 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp3_; -#line 1364 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1371 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 10923 "BatchImport.c" +#line 10395 "BatchImport.c" } void background_import_job_abort (BackgroundImportJob* self, ImportResult _result_) { - ImportResult _tmp0_ = 0; -#line 1367 "/home/jens/Source/shotwell/src/BatchImport.vala" + ImportResult _tmp0_; +#line 1374 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BACKGROUND_IMPORT_JOB (self)); -#line 1369 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1376 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = self->abort_flag; -#line 1369 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1376 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp0_ == IMPORT_RESULT_SUCCESS) { -#line 10935 "BatchImport.c" - ImportResult _tmp1_ = 0; -#line 1370 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 10407 "BatchImport.c" + ImportResult _tmp1_; +#line 1377 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = _result_; -#line 1370 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1377 "/home/jens/Source/shotwell/src/BatchImport.vala" self->abort_flag = _tmp1_; -#line 10941 "BatchImport.c" +#line 10413 "BatchImport.c" } } void background_import_job_report_failure (BackgroundImportJob* self, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, ImportResult _result_) { - ImportResult _tmp0_ = 0; - ImportResult _tmp1_ = 0; - gboolean _tmp2_ = FALSE; - GeeList* _tmp8_ = NULL; - BatchImportJob* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - ImportResult _tmp13_ = 0; - BatchImportResult* _tmp14_ = NULL; - BatchImportResult* _tmp15_ = NULL; -#line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala" + ImportResult _tmp0_; + ImportResult _tmp1_; + gboolean _tmp2_; + GeeList* _tmp8_; + BatchImportJob* _tmp9_; + GFile* _tmp10_; + const gchar* _tmp11_; + const gchar* _tmp12_; + ImportResult _tmp13_; + BatchImportResult* _tmp14_; + BatchImportResult* _tmp15_; +#line 1380 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BACKGROUND_IMPORT_JOB (self)); -#line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1380 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT_JOB (job)); -#line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1380 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail ((file == NULL) || G_IS_FILE (file)); -#line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1380 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (src_identifier != NULL); -#line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1380 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (dest_identifier != NULL); -#line 1375 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1382 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _result_; -#line 1375 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1382 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (_tmp0_ != IMPORT_RESULT_SUCCESS, "result != ImportResult.SUCCESS"); -#line 1378 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = _result_; -#line 1378 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = import_result_is_abort (_tmp1_); -#line 1378 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp2_) { -#line 10978 "BatchImport.c" - ImportResult _tmp3_ = 0; -#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 10450 "BatchImport.c" + ImportResult _tmp3_; +#line 1386 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = _result_; -#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1386 "/home/jens/Source/shotwell/src/BatchImport.vala" background_import_job_abort (self, _tmp3_); -#line 10984 "BatchImport.c" +#line 10456 "BatchImport.c" } else { - const gchar* _tmp4_ = NULL; - ImportResult _tmp5_ = 0; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; -#line 1381 "/home/jens/Source/shotwell/src/BatchImport.vala" + const gchar* _tmp4_; + ImportResult _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; +#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = src_identifier; -#line 1381 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = _result_; -#line 1381 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = import_result_to_string (_tmp5_); -#line 1381 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = _tmp6_; -#line 1381 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_warning ("BatchImport.vala:1381: Import failure %s: %s", _tmp4_, _tmp7_); -#line 1381 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala" + g_warning ("BatchImport.vala:1388: Import failure %s: %s", _tmp4_, _tmp7_); +#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp7_); -#line 11002 "BatchImport.c" +#line 10474 "BatchImport.c" } -#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = self->failed; -#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = job; -#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = file; -#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = src_identifier; -#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = dest_identifier; -#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = _result_; -#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = batch_import_result_new (_tmp9_, _tmp10_, _tmp11_, _tmp12_, NULL, _tmp13_); -#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp15_ = _tmp14_; -#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_); -#line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (_tmp15_); -#line 11024 "BatchImport.c" +#line 10496 "BatchImport.c" } void background_import_job_report_error (BackgroundImportJob* self, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result) { ImportResult _result_ = 0; - GError* _tmp0_ = NULL; - ImportResult _tmp1_ = 0; - ImportResult _tmp2_ = 0; - const gchar* _tmp3_ = NULL; - GError* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - ImportResult _tmp6_ = 0; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - ImportResult _tmp9_ = 0; - gboolean _tmp10_ = FALSE; - GeeList* _tmp12_ = NULL; - BatchImportJob* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - GError* _tmp17_ = NULL; - ImportResult _tmp18_ = 0; - BatchImportResult* _tmp19_ = NULL; - BatchImportResult* _tmp20_ = NULL; -#line 1387 "/home/jens/Source/shotwell/src/BatchImport.vala" + GError* _tmp0_; + ImportResult _tmp1_; + ImportResult _tmp2_; + const gchar* _tmp3_; + GError* _tmp4_; + const gchar* _tmp5_; + ImportResult _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + ImportResult _tmp9_; + gboolean _tmp10_; + GeeList* _tmp12_; + BatchImportJob* _tmp13_; + GFile* _tmp14_; + const gchar* _tmp15_; + const gchar* _tmp16_; + GError* _tmp17_; + ImportResult _tmp18_; + BatchImportResult* _tmp19_; + BatchImportResult* _tmp20_; +#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BACKGROUND_IMPORT_JOB (self)); -#line 1387 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT_JOB (job)); -#line 1387 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail ((file == NULL) || G_IS_FILE (file)); -#line 1387 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (src_identifier != NULL); -#line 1387 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (dest_identifier != NULL); -#line 1389 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = err; -#line 1389 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = default_result; -#line 1389 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = import_result_convert_error (_tmp0_, _tmp1_); -#line 1389 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala" _result_ = _tmp2_; -#line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = src_identifier; -#line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = err; -#line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = _tmp4_->message; -#line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = _result_; -#line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = import_result_to_string (_tmp6_); -#line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = _tmp7_; -#line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_warning ("BatchImport.vala:1391: Import error %s: %s (%s)", _tmp3_, _tmp5_, _tmp8_); -#line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala" + g_warning ("BatchImport.vala:1398: Import error %s: %s (%s)", _tmp3_, _tmp5_, _tmp8_); +#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp8_); -#line 1393 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1400 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = _result_; -#line 1393 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1400 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = import_result_is_abort (_tmp9_); -#line 1393 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1400 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp10_) { -#line 11090 "BatchImport.c" - ImportResult _tmp11_ = 0; -#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 10562 "BatchImport.c" + ImportResult _tmp11_; +#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = _result_; -#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" background_import_job_abort (self, _tmp11_); -#line 11096 "BatchImport.c" +#line 10568 "BatchImport.c" } -#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = self->failed; -#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = job; -#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = file; -#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp15_ = src_identifier; -#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp16_ = dest_identifier; -#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp17_ = err; -#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp18_ = default_result; -#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp19_ = batch_import_result_new_from_error (_tmp13_, _tmp14_, _tmp15_, _tmp16_, _tmp17_, _tmp18_); -#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp20_ = _tmp19_; -#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_); -#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (_tmp20_); -#line 11120 "BatchImport.c" +#line 10592 "BatchImport.c" } static void background_import_job_class_init (BackgroundImportJobClass * klass) { -#line 1349 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1356 "/home/jens/Source/shotwell/src/BatchImport.vala" background_import_job_parent_class = g_type_class_peek_parent (klass); -#line 1349 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1356 "/home/jens/Source/shotwell/src/BatchImport.vala" ((BackgroundJobClass *) klass)->finalize = background_import_job_finalize; -#line 11129 "BatchImport.c" +#line 10601 "BatchImport.c" } static void background_import_job_instance_init (BackgroundImportJob * self) { - GeeArrayList* _tmp0_ = NULL; -#line 1350 "/home/jens/Source/shotwell/src/BatchImport.vala" + GeeArrayList* _tmp0_; +#line 1357 "/home/jens/Source/shotwell/src/BatchImport.vala" self->abort_flag = IMPORT_RESULT_SUCCESS; -#line 1351 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1358 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL); -#line 1351 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1358 "/home/jens/Source/shotwell/src/BatchImport.vala" self->failed = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList); -#line 11141 "BatchImport.c" +#line 10613 "BatchImport.c" } -static void background_import_job_finalize (BackgroundJob* obj) { +static void background_import_job_finalize (BackgroundJob * obj) { BackgroundImportJob * self; -#line 1349 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1356 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob); -#line 1351 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1358 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->failed); -#line 1349 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1356 "/home/jens/Source/shotwell/src/BatchImport.vala" BACKGROUND_JOB_CLASS (background_import_job_parent_class)->finalize (obj); -#line 11153 "BatchImport.c" +#line 10625 "BatchImport.c" } @@ -11174,498 +10646,498 @@ GType background_import_job_get_type (void) { FileToPrepare* file_to_prepare_construct (GType object_type, BatchImportJob* job, GFile* file, gboolean copy_to_library) { FileToPrepare* self = NULL; - BatchImportJob* _tmp0_ = NULL; - BatchImportJob* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; -#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImportJob* _tmp0_; + BatchImportJob* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; + gboolean _tmp4_; +#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL); -#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL); -#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (FileToPrepare*) g_type_create_instance (object_type); -#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = job; -#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = _batch_import_job_ref0 (_tmp0_); -#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (self->job); -#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala" self->job = _tmp1_; -#line 1409 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1416 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = file; -#line 1409 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1416 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = _g_object_ref0 (_tmp2_); -#line 1409 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1416 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->file); -#line 1409 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1416 "/home/jens/Source/shotwell/src/BatchImport.vala" self->file = _tmp3_; -#line 1410 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1417 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = copy_to_library; -#line 1410 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1417 "/home/jens/Source/shotwell/src/BatchImport.vala" self->copy_to_library = _tmp4_; -#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 11204 "BatchImport.c" +#line 10676 "BatchImport.c" } FileToPrepare* file_to_prepare_new (BatchImportJob* job, GFile* file, gboolean copy_to_library) { -#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala" return file_to_prepare_construct (TYPE_FILE_TO_PREPARE, job, file, copy_to_library); -#line 11211 "BatchImport.c" +#line 10683 "BatchImport.c" } static gpointer _file_to_prepare_ref0 (gpointer self) { -#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1421 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? file_to_prepare_ref (self) : NULL; -#line 11218 "BatchImport.c" +#line 10690 "BatchImport.c" } void file_to_prepare_set_associated (FileToPrepare* self, FileToPrepare* a) { - FileToPrepare* _tmp0_ = NULL; - FileToPrepare* _tmp1_ = NULL; -#line 1413 "/home/jens/Source/shotwell/src/BatchImport.vala" + FileToPrepare* _tmp0_; + FileToPrepare* _tmp1_; +#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_FILE_TO_PREPARE (self)); -#line 1413 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail ((a == NULL) || IS_FILE_TO_PREPARE (a)); -#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1421 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = a; -#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1421 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = _file_to_prepare_ref0 (_tmp0_); -#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1421 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (self->associated); -#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1421 "/home/jens/Source/shotwell/src/BatchImport.vala" self->associated = _tmp1_; -#line 11237 "BatchImport.c" +#line 10709 "BatchImport.c" } gchar* file_to_prepare_get_parent_path (FileToPrepare* self) { gchar* result = NULL; gchar* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; -#line 1417 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp1_; +#line 1424 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_FILE_TO_PREPARE (self), NULL); -#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = self->file; -#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp1_ != NULL) { -#line 11251 "BatchImport.c" - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; -#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 10723 "BatchImport.c" + GFile* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; + gchar* _tmp5_; +#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = self->file; -#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = g_file_get_parent (_tmp2_); -#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = _tmp3_; -#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = g_file_get_path (_tmp4_); -#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp0_); -#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp5_; -#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp4_); -#line 11270 "BatchImport.c" +#line 10742 "BatchImport.c" } else { - BatchImportJob* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; -#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImportJob* _tmp6_; + gchar* _tmp7_; +#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = self->job; -#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = batch_import_job_get_path (_tmp6_); -#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp0_); -#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp7_; -#line 11282 "BatchImport.c" +#line 10754 "BatchImport.c" } -#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp0_; -#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 11288 "BatchImport.c" +#line 10760 "BatchImport.c" } gchar* file_to_prepare_get_path (FileToPrepare* self) { gchar* result = NULL; gchar* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; -#line 1421 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp1_; +#line 1428 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_FILE_TO_PREPARE (self), NULL); -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = self->file; -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp1_ != NULL) { -#line 11302 "BatchImport.c" - GFile* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 10774 "BatchImport.c" + GFile* _tmp2_; + gchar* _tmp3_; +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = self->file; -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = g_file_get_path (_tmp2_); -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp0_); -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp3_; -#line 11313 "BatchImport.c" +#line 10785 "BatchImport.c" } else { - BatchImportJob* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; - BatchImportJob* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImportJob* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GFile* _tmp7_; + GFile* _tmp8_; + BatchImportJob* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + GFile* _tmp12_; + GFile* _tmp13_; + gchar* _tmp14_; +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = self->job; -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = batch_import_job_get_path (_tmp4_); -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = _tmp5_; -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = g_file_new_for_path (_tmp6_); -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = _tmp7_; -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = self->job; -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = batch_import_job_get_basename (_tmp9_); -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = _tmp10_; -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = g_file_get_child (_tmp8_, _tmp11_); -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = _tmp12_; -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = g_file_get_path (_tmp13_); -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp0_); -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp14_; -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp13_); -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp11_); -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp8_); -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp6_); -#line 11360 "BatchImport.c" +#line 10832 "BatchImport.c" } -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp0_; -#line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 11366 "BatchImport.c" +#line 10838 "BatchImport.c" } gchar* file_to_prepare_get_basename (FileToPrepare* self) { gchar* result = NULL; gchar* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; -#line 1426 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp1_; +#line 1433 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_FILE_TO_PREPARE (self), NULL); -#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = self->file; -#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp1_ != NULL) { -#line 11380 "BatchImport.c" - GFile* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 10852 "BatchImport.c" + GFile* _tmp2_; + gchar* _tmp3_; +#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = self->file; -#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = g_file_get_basename (_tmp2_); -#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp0_); -#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp3_; -#line 11391 "BatchImport.c" +#line 10863 "BatchImport.c" } else { - BatchImportJob* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; -#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImportJob* _tmp4_; + gchar* _tmp5_; +#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = self->job; -#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = batch_import_job_get_basename (_tmp4_); -#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp0_); -#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp5_; -#line 11403 "BatchImport.c" +#line 10875 "BatchImport.c" } -#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp0_; -#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 11409 "BatchImport.c" +#line 10881 "BatchImport.c" } gboolean file_to_prepare_is_directory (FileToPrepare* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - GFile* _tmp1_ = NULL; -#line 1430 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp1_; +#line 1437 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_FILE_TO_PREPARE (self), FALSE); -#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = self->file; -#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp1_ != NULL) { -#line 11423 "BatchImport.c" - GFile* _tmp2_ = NULL; - GFileType _tmp3_ = 0; -#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 10895 "BatchImport.c" + GFile* _tmp2_; + GFileType _tmp3_; +#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = self->file; -#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = g_file_query_file_type (_tmp2_, G_FILE_QUERY_INFO_NONE, NULL); -#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp3_ == G_FILE_TYPE_DIRECTORY; -#line 11432 "BatchImport.c" +#line 10904 "BatchImport.c" } else { - BatchImportJob* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; -#line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImportJob* _tmp4_; + gboolean _tmp5_; +#line 1439 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = self->job; -#line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1439 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = batch_import_job_is_directory (_tmp4_); -#line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1439 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp5_; -#line 11442 "BatchImport.c" +#line 10914 "BatchImport.c" } -#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp0_; -#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 11448 "BatchImport.c" +#line 10920 "BatchImport.c" } static void value_file_to_prepare_init (GValue* value) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 11455 "BatchImport.c" +#line 10927 "BatchImport.c" } static void value_file_to_prepare_free_value (GValue* value) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" if (value->data[0].v_pointer) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" file_to_prepare_unref (value->data[0].v_pointer); -#line 11464 "BatchImport.c" +#line 10936 "BatchImport.c" } } static void value_file_to_prepare_copy_value (const GValue* src_value, GValue* dest_value) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" if (src_value->data[0].v_pointer) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = file_to_prepare_ref (src_value->data[0].v_pointer); -#line 11474 "BatchImport.c" +#line 10946 "BatchImport.c" } else { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = NULL; -#line 11478 "BatchImport.c" +#line 10950 "BatchImport.c" } } static gpointer value_file_to_prepare_peek_pointer (const GValue* value) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 11486 "BatchImport.c" +#line 10958 "BatchImport.c" } static gchar* value_file_to_prepare_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" if (collect_values[0].v_pointer) { -#line 11493 "BatchImport.c" - FileToPrepare* object; +#line 10965 "BatchImport.c" + FileToPrepare * object; object = collect_values[0].v_pointer; -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" if (object->parent_instance.g_class == NULL) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 11500 "BatchImport.c" +#line 10972 "BatchImport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 11504 "BatchImport.c" +#line 10976 "BatchImport.c" } -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = file_to_prepare_ref (object); -#line 11508 "BatchImport.c" +#line 10980 "BatchImport.c" } else { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 11512 "BatchImport.c" +#line 10984 "BatchImport.c" } -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 11516 "BatchImport.c" +#line 10988 "BatchImport.c" } static gchar* value_file_to_prepare_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - FileToPrepare** object_p; + FileToPrepare ** object_p; object_p = collect_values[0].v_pointer; -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!object_p) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 11527 "BatchImport.c" +#line 10999 "BatchImport.c" } -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!value->data[0].v_pointer) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = NULL; -#line 11533 "BatchImport.c" +#line 11005 "BatchImport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = value->data[0].v_pointer; -#line 11537 "BatchImport.c" +#line 11009 "BatchImport.c" } else { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = file_to_prepare_ref (value->data[0].v_pointer); -#line 11541 "BatchImport.c" +#line 11013 "BatchImport.c" } -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 11545 "BatchImport.c" +#line 11017 "BatchImport.c" } GParamSpec* param_spec_file_to_prepare (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { ParamSpecFileToPrepare* spec; -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_FILE_TO_PREPARE), NULL); -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" return G_PARAM_SPEC (spec); -#line 11559 "BatchImport.c" +#line 11031 "BatchImport.c" } gpointer value_get_file_to_prepare (const GValue* value) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FILE_TO_PREPARE), NULL); -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 11568 "BatchImport.c" +#line 11040 "BatchImport.c" } void value_set_file_to_prepare (GValue* value, gpointer v_object) { - FileToPrepare* old; -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" + FileToPrepare * old; +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FILE_TO_PREPARE)); -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" old = value->data[0].v_pointer; -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" if (v_object) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_FILE_TO_PREPARE)); -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" file_to_prepare_ref (value->data[0].v_pointer); -#line 11588 "BatchImport.c" +#line 11060 "BatchImport.c" } else { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 11592 "BatchImport.c" +#line 11064 "BatchImport.c" } -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" file_to_prepare_unref (old); -#line 11598 "BatchImport.c" +#line 11070 "BatchImport.c" } } void value_take_file_to_prepare (GValue* value, gpointer v_object) { - FileToPrepare* old; -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" + FileToPrepare * old; +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FILE_TO_PREPARE)); -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" old = value->data[0].v_pointer; -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" if (v_object) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_FILE_TO_PREPARE)); -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 11617 "BatchImport.c" +#line 11089 "BatchImport.c" } else { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 11621 "BatchImport.c" +#line 11093 "BatchImport.c" } -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" file_to_prepare_unref (old); -#line 11627 "BatchImport.c" +#line 11099 "BatchImport.c" } } static void file_to_prepare_class_init (FileToPrepareClass * klass) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" file_to_prepare_parent_class = g_type_class_peek_parent (klass); -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" ((FileToPrepareClass *) klass)->finalize = file_to_prepare_finalize; -#line 11637 "BatchImport.c" +#line 11109 "BatchImport.c" } static void file_to_prepare_instance_init (FileToPrepare * self) { -#line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1412 "/home/jens/Source/shotwell/src/BatchImport.vala" self->associated = NULL; -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ref_count = 1; -#line 11646 "BatchImport.c" +#line 11118 "BatchImport.c" } -static void file_to_prepare_finalize (FileToPrepare* obj) { +static void file_to_prepare_finalize (FileToPrepare * obj) { FileToPrepare * self; -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FILE_TO_PREPARE, FileToPrepare); -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" g_signal_handlers_destroy (self); -#line 1402 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1409 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (self->job); -#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1410 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->file); -#line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1412 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (self->associated); -#line 11662 "BatchImport.c" +#line 11134 "BatchImport.c" } @@ -11684,857 +11156,857 @@ GType file_to_prepare_get_type (void) { gpointer file_to_prepare_ref (gpointer instance) { - FileToPrepare* self; + FileToPrepare * self; self = instance; -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" g_atomic_int_inc (&self->ref_count); -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" return instance; -#line 11687 "BatchImport.c" +#line 11159 "BatchImport.c" } void file_to_prepare_unref (gpointer instance) { - FileToPrepare* self; + FileToPrepare * self; self = instance; -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" FILE_TO_PREPARE_GET_CLASS (self)->finalize (self); -#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 11700 "BatchImport.c" +#line 11172 "BatchImport.c" } } WorkSniffer* work_sniffer_construct (GType object_type, BatchImport* owner, GeeIterable* jobs, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, GeeHashSet* skipset) { WorkSniffer* self = NULL; - BatchImport* _tmp0_ = NULL; - CompletionCallback _tmp1_ = NULL; - void* _tmp1__target = NULL; - GCancellable* _tmp2_ = NULL; - CancellationCallback _tmp3_ = NULL; - void* _tmp3__target = NULL; - GeeIterable* _tmp4_ = NULL; - GeeIterable* _tmp5_ = NULL; - GeeHashSet* _tmp6_ = NULL; - GeeHashSet* _tmp7_ = NULL; -#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImport* _tmp0_; + CompletionCallback _tmp1_; + void* _tmp1__target; + GCancellable* _tmp2_; + CancellationCallback _tmp3_; + void* _tmp3__target; + GeeIterable* _tmp4_; + GeeIterable* _tmp5_; + GeeHashSet* _tmp6_; + GeeHashSet* _tmp7_; +#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL); -#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (GEE_IS_ITERABLE (jobs), NULL); -#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL); -#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail ((skipset == NULL) || GEE_IS_HASH_SET (skipset), NULL); -#line 1445 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = owner; -#line 1445 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = callback; -#line 1445 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1__target = callback_target; -#line 1445 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = cancellable; -#line 1445 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = cancellation; -#line 1445 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3__target = cancellation_target; -#line 1445 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (WorkSniffer*) background_import_job_construct (object_type, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target); -#line 1447 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1454 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = jobs; -#line 1447 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1454 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 1447 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1454 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->jobs); -#line 1447 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1454 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->jobs = _tmp5_; -#line 1448 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = skipset; -#line 1448 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = _g_object_ref0 (_tmp6_); -#line 1448 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->skipset); -#line 1448 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->skipset = _tmp7_; -#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 11757 "BatchImport.c" +#line 11229 "BatchImport.c" } WorkSniffer* work_sniffer_new (BatchImport* owner, GeeIterable* jobs, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, GeeHashSet* skipset) { -#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala" return work_sniffer_construct (TYPE_WORK_SNIFFER, owner, jobs, callback, callback_target, cancellable, cancellation, cancellation_target, skipset); -#line 11764 "BatchImport.c" +#line 11236 "BatchImport.c" } -static gint __lambda10_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b) { +static gint __lambda11_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b) { gint result = 0; FileToPrepare* file_a = NULL; - FileToPrepare* _tmp0_ = NULL; - FileToPrepare* _tmp1_ = NULL; + FileToPrepare* _tmp0_; + FileToPrepare* _tmp1_; FileToPrepare* file_b = NULL; - FileToPrepare* _tmp2_ = NULL; - FileToPrepare* _tmp3_ = NULL; + FileToPrepare* _tmp2_; + FileToPrepare* _tmp3_; gchar* sa = NULL; - gchar* _tmp4_ = NULL; + gchar* _tmp4_; gchar* sb = NULL; - gchar* _tmp5_ = NULL; - gint _tmp6_ = 0; -#line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala" + gchar* _tmp5_; + gint _tmp6_; +#line 1490 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_FILE_TO_PREPARE (a), 0); -#line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1490 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_FILE_TO_PREPARE (b), 0); -#line 1484 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = a; -#line 1484 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = _file_to_prepare_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_FILE_TO_PREPARE, FileToPrepare)); -#line 1484 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala" file_a = _tmp1_; -#line 1485 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1492 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = b; -#line 1485 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1492 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = _file_to_prepare_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_FILE_TO_PREPARE, FileToPrepare)); -#line 1485 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1492 "/home/jens/Source/shotwell/src/BatchImport.vala" file_b = _tmp3_; -#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = file_to_prepare_get_path (file_a); -#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala" sa = _tmp4_; -#line 1487 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1494 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = file_to_prepare_get_path (file_b); -#line 1487 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1494 "/home/jens/Source/shotwell/src/BatchImport.vala" sb = _tmp5_; -#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = utf8_cs_compare (sa, sb); -#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp6_; -#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (sb); -#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (sa); -#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (file_b); -#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (file_a); -#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 11819 "BatchImport.c" +#line 11291 "BatchImport.c" } -static gint ___lambda10__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gint ___lambda11__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { gint result; - result = __lambda10_ ((WorkSniffer*) self, (FileToPrepare*) a, (FileToPrepare*) b); -#line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala" + result = __lambda11_ ((WorkSniffer*) self, (FileToPrepare*) a, (FileToPrepare*) b); +#line 1490 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 11828 "BatchImport.c" +#line 11300 "BatchImport.c" } static void work_sniffer_real_execute (BackgroundJob* base) { WorkSniffer * self; GeeList* sorted = NULL; - GeeArrayList* _tmp26_ = NULL; - GeeList* _tmp42_ = NULL; + GeeArrayList* _tmp26_; + GeeList* _tmp42_; GError * _inner_error_ = NULL; -#line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_WORK_SNIFFER, WorkSniffer); -#line 11840 "BatchImport.c" +#line 11312 "BatchImport.c" { GeeIterator* _job_it = NULL; - GeeIterable* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; -#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" + GeeIterable* _tmp0_; + GeeIterator* _tmp1_; +#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = self->priv->jobs; -#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = gee_iterable_iterator (_tmp0_); -#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala" _job_it = _tmp1_; -#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 11853 "BatchImport.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 11325 "BatchImport.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; BatchImportJob* job = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; ImportResult _result_ = 0; - ImportResult _tmp6_ = 0; - ImportResult _tmp7_ = 0; - gboolean _tmp25_ = FALSE; -#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" + ImportResult _tmp6_; + ImportResult _tmp7_; + gboolean _tmp25_; +#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = _job_it; -#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = gee_iterator_next (_tmp2_); -#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!_tmp3_) { -#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 11871 "BatchImport.c" +#line 11343 "BatchImport.c" } -#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = _job_it; -#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = gee_iterator_get (_tmp4_); -#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala" job = (BatchImportJob*) _tmp5_; -#line 1456 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1463 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob)); -#line 1456 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1463 "/home/jens/Source/shotwell/src/BatchImport.vala" _result_ = _tmp6_; -#line 1457 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = _result_; -#line 1457 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp7_ != IMPORT_RESULT_SUCCESS) { -#line 11887 "BatchImport.c" - BatchImportJob* _tmp8_ = NULL; - BatchImportJob* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - BatchImportJob* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - ImportResult _tmp15_ = 0; -#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 11359 "BatchImport.c" + BatchImportJob* _tmp8_; + BatchImportJob* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + BatchImportJob* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + ImportResult _tmp15_; +#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = job; -#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = job; -#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = batch_import_job_get_source_identifier (_tmp9_); -#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = _tmp10_; -#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = job; -#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = batch_import_job_get_dest_identifier (_tmp12_); -#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = _tmp13_; -#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp15_ = _result_; -#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala" background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp8_, NULL, _tmp11_, _tmp14_, _tmp15_); -#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp14_); -#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp11_); -#line 1461 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1468 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (job); -#line 1461 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1468 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 11922 "BatchImport.c" +#line 11394 "BatchImport.c" } { - BatchImportJob* _tmp16_ = NULL; -#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImportJob* _tmp16_; +#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp16_ = job; -#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala" work_sniffer_sniff_job (self, _tmp16_, &_inner_error_); -#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11932 "BatchImport.c" - goto __catch413_g_error; +#line 11404 "BatchImport.c" + goto __catch414_g_error; } } - goto __finally413; - __catch413_g_error: + goto __finally414; + __catch414_g_error: { GError* err = NULL; - BatchImportJob* _tmp17_ = NULL; - BatchImportJob* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - BatchImportJob* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - GError* _tmp24_ = NULL; -#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImportJob* _tmp17_; + BatchImportJob* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; + BatchImportJob* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + GError* _tmp24_; +#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; -#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; -#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp17_ = job; -#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp18_ = job; -#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp19_ = batch_import_job_get_source_identifier (_tmp18_); -#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp20_ = _tmp19_; -#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp21_ = job; -#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp22_ = batch_import_job_get_dest_identifier (_tmp21_); -#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp23_ = _tmp22_; -#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp24_ = err; -#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala" background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp17_, NULL, _tmp20_, _tmp23_, _tmp24_, IMPORT_RESULT_FILE_ERROR); -#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp23_); -#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp20_); -#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 11976 "BatchImport.c" +#line 11448 "BatchImport.c" } - __finally413: -#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala" + __finally414: +#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (job); -#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_job_it); -#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala" g_clear_error (&_inner_error_); -#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 11991 "BatchImport.c" +#line 11463 "BatchImport.c" } -#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1478 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp25_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob)); -#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1478 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp25_) { -#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (job); -#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 12001 "BatchImport.c" +#line 11473 "BatchImport.c" } -#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (job); -#line 12005 "BatchImport.c" +#line 11477 "BatchImport.c" } -#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_job_it); -#line 12009 "BatchImport.c" +#line 11481 "BatchImport.c" } -#line 1478 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1485 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp26_ = gee_array_list_new (TYPE_FILE_TO_PREPARE, (GBoxedCopyFunc) file_to_prepare_ref, (GDestroyNotify) file_to_prepare_unref, NULL, NULL, NULL); -#line 1478 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1485 "/home/jens/Source/shotwell/src/BatchImport.vala" sorted = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_LIST, GeeList); -#line 12015 "BatchImport.c" +#line 11487 "BatchImport.c" { GeeList* _ftp_list = NULL; - GeeList* _tmp27_ = NULL; - GeeList* _tmp28_ = NULL; + GeeList* _tmp27_; + GeeList* _tmp28_; gint _ftp_size = 0; - GeeList* _tmp29_ = NULL; - gint _tmp30_ = 0; - gint _tmp31_ = 0; + GeeList* _tmp29_; + gint _tmp30_; + gint _tmp31_; gint _ftp_index = 0; -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp27_ = self->files_to_prepare; -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp28_ = _g_object_ref0 (_tmp27_); -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" _ftp_list = _tmp28_; -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp29_ = _ftp_list; -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp31_ = _tmp30_; -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" _ftp_size = _tmp31_; -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" _ftp_index = -1; -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 12043 "BatchImport.c" - gint _tmp32_ = 0; - gint _tmp33_ = 0; - gint _tmp34_ = 0; +#line 11515 "BatchImport.c" + gint _tmp32_; + gint _tmp33_; + gint _tmp34_; FileToPrepare* ftp = NULL; - GeeList* _tmp35_ = NULL; - gint _tmp36_ = 0; - gpointer _tmp37_ = NULL; - FileToPrepare* _tmp38_ = NULL; - gboolean _tmp39_ = FALSE; -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" + GeeList* _tmp35_; + gint _tmp36_; + gpointer _tmp37_; + FileToPrepare* _tmp38_; + gboolean _tmp39_; +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp32_ = _ftp_index; -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" _ftp_index = _tmp32_ + 1; -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp33_ = _ftp_index; -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp34_ = _ftp_size; -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!(_tmp33_ < _tmp34_)) { -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 12065 "BatchImport.c" +#line 11537 "BatchImport.c" } -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp35_ = _ftp_list; -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp36_ = _ftp_index; -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp37_ = gee_list_get (_tmp35_, _tmp36_); -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" ftp = (FileToPrepare*) _tmp37_; -#line 1480 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1487 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp38_ = ftp; -#line 1480 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1487 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp39_ = file_to_prepare_is_directory (_tmp38_); -#line 1480 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1487 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!_tmp39_) { -#line 12081 "BatchImport.c" - GeeList* _tmp40_ = NULL; - FileToPrepare* _tmp41_ = NULL; -#line 1481 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 11553 "BatchImport.c" + GeeList* _tmp40_; + FileToPrepare* _tmp41_; +#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp40_ = sorted; -#line 1481 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp41_ = ftp; -#line 1481 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_COLLECTION, GeeCollection), _tmp41_); -#line 12090 "BatchImport.c" +#line 11562 "BatchImport.c" } -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (ftp); -#line 12094 "BatchImport.c" +#line 11566 "BatchImport.c" } -#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_ftp_list); -#line 12098 "BatchImport.c" +#line 11570 "BatchImport.c" } -#line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1490 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp42_ = sorted; -#line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala" - gee_list_sort (_tmp42_, ___lambda10__gcompare_data_func, background_job_ref (self), background_job_unref); -#line 12104 "BatchImport.c" +#line 1490 "/home/jens/Source/shotwell/src/BatchImport.vala" + gee_list_sort (_tmp42_, ___lambda11__gcompare_data_func, background_job_ref (self), background_job_unref); +#line 11576 "BatchImport.c" { gint i = 0; -#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala" i = 0; -#line 12109 "BatchImport.c" +#line 11581 "BatchImport.c" { gboolean _tmp43_ = FALSE; -#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp43_ = TRUE; -#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 12116 "BatchImport.c" - gint _tmp45_ = 0; - GeeList* _tmp46_ = NULL; - gint _tmp47_ = 0; - gint _tmp48_ = 0; +#line 11588 "BatchImport.c" + gint _tmp45_; + GeeList* _tmp46_; + gint _tmp47_; + gint _tmp48_; gchar* name = NULL; gchar* ext = NULL; FileToPrepare* ftp = NULL; - GeeList* _tmp49_ = NULL; - gint _tmp50_ = 0; - gpointer _tmp51_ = NULL; - FileToPrepare* _tmp52_ = NULL; - gchar* _tmp53_ = NULL; - gchar* _tmp54_ = NULL; + GeeList* _tmp49_; + gint _tmp50_; + gpointer _tmp51_; + FileToPrepare* _tmp52_; + gchar* _tmp53_; + gchar* _tmp54_; gchar* _tmp55_ = NULL; gchar* _tmp56_ = NULL; - const gchar* _tmp57_ = NULL; - gboolean _tmp58_ = FALSE; - RawFileFormatProperties* _tmp59_ = NULL; - RawFileFormatProperties* _tmp60_ = NULL; - const gchar* _tmp61_ = NULL; - gboolean _tmp62_ = FALSE; - gboolean _tmp63_ = FALSE; -#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala" + const gchar* _tmp57_; + gboolean _tmp58_; + RawFileFormatProperties* _tmp59_; + RawFileFormatProperties* _tmp60_; + const gchar* _tmp61_; + gboolean _tmp62_; + gboolean _tmp63_; +#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!_tmp43_) { -#line 12141 "BatchImport.c" - gint _tmp44_ = 0; -#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 11613 "BatchImport.c" + gint _tmp44_; +#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp44_ = i; -#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala" i = _tmp44_ + 1; -#line 12147 "BatchImport.c" +#line 11619 "BatchImport.c" } -#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp43_ = FALSE; -#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp45_ = i; -#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp46_ = sorted; -#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp47_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp48_ = _tmp47_; -#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!(_tmp45_ < _tmp48_)) { -#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 12163 "BatchImport.c" +#line 11635 "BatchImport.c" } -#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1502 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp49_ = sorted; -#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1502 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp50_ = i; -#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1502 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp51_ = gee_list_get (_tmp49_, _tmp50_); -#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1502 "/home/jens/Source/shotwell/src/BatchImport.vala" ftp = (FileToPrepare*) _tmp51_; -#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp52_ = ftp; -#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp53_ = file_to_prepare_get_basename (_tmp52_); -#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp54_ = _tmp53_; -#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" disassemble_filename (_tmp54_, &_tmp55_, &_tmp56_); -#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (name); -#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" name = _tmp55_; -#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (ext); -#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" ext = _tmp56_; -#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp54_); -#line 1498 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp57_ = ext; -#line 1498 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp58_ = is_string_empty (_tmp57_); -#line 1498 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp58_) { -#line 1499 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1506 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (ftp); -#line 1499 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1506 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (ext); -#line 1499 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1506 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (name); -#line 1499 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1506 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 12205 "BatchImport.c" +#line 11677 "BatchImport.c" } -#line 1501 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp59_ = raw_file_format_properties_get_instance (); -#line 1501 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp60_ = _tmp59_; -#line 1501 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp61_ = ext; -#line 1501 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp62_ = photo_file_format_properties_is_recognized_extension (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties), _tmp61_); -#line 1501 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp63_ = _tmp62_; -#line 1501 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" _photo_file_format_properties_unref0 (_tmp60_); -#line 1501 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp63_) { -#line 12221 "BatchImport.c" +#line 11693 "BatchImport.c" gboolean _tmp64_ = FALSE; - gint _tmp65_ = 0; -#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala" + gint _tmp65_; +#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp65_ = i; -#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp65_ > 0) { -#line 12228 "BatchImport.c" - FileToPrepare* _tmp66_ = NULL; - GeeList* _tmp67_ = NULL; - gint _tmp68_ = 0; - gpointer _tmp69_ = NULL; - FileToPrepare* _tmp70_ = NULL; - gboolean _tmp71_ = FALSE; -#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 11700 "BatchImport.c" + FileToPrepare* _tmp66_; + GeeList* _tmp67_; + gint _tmp68_; + gpointer _tmp69_; + FileToPrepare* _tmp70_; + gboolean _tmp71_; +#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp66_ = ftp; -#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp67_ = sorted; -#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp68_ = i; -#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp69_ = gee_list_get (_tmp67_, _tmp68_ - 1); -#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp70_ = (FileToPrepare*) _tmp69_; -#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp71_ = work_sniffer_is_paired (self, _tmp66_, _tmp70_); -#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp64_ = _tmp71_; -#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (_tmp70_); -#line 12251 "BatchImport.c" +#line 11723 "BatchImport.c" } else { -#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp64_ = FALSE; -#line 12255 "BatchImport.c" +#line 11727 "BatchImport.c" } -#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp64_) { -#line 12259 "BatchImport.c" +#line 11731 "BatchImport.c" FileToPrepare* associated_file = NULL; - GeeList* _tmp72_ = NULL; - gint _tmp73_ = 0; - gpointer _tmp74_ = NULL; - GeeList* _tmp75_ = NULL; - FileToPrepare* _tmp76_ = NULL; - FileToPrepare* _tmp77_ = NULL; - FileToPrepare* _tmp78_ = NULL; -#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala" + GeeList* _tmp72_; + gint _tmp73_; + gpointer _tmp74_; + GeeList* _tmp75_; + FileToPrepare* _tmp76_; + FileToPrepare* _tmp77_; + FileToPrepare* _tmp78_; +#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp72_ = sorted; -#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp73_ = i; -#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp74_ = gee_list_get (_tmp72_, _tmp73_ - 1); -#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala" associated_file = (FileToPrepare*) _tmp74_; -#line 1506 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1513 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp75_ = self->files_to_prepare; -#line 1506 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1513 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp76_ = associated_file; -#line 1506 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1513 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_COLLECTION, GeeCollection), _tmp76_); -#line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1514 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp77_ = ftp; -#line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1514 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp78_ = associated_file; -#line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1514 "/home/jens/Source/shotwell/src/BatchImport.vala" file_to_prepare_set_associated (_tmp77_, _tmp78_); -#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (associated_file); -#line 12290 "BatchImport.c" +#line 11762 "BatchImport.c" } else { gboolean _tmp79_ = FALSE; - gint _tmp80_ = 0; - GeeList* _tmp81_ = NULL; - gint _tmp82_ = 0; - gint _tmp83_ = 0; -#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" + gint _tmp80_; + GeeList* _tmp81_; + gint _tmp82_; + gint _tmp83_; +#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp80_ = i; -#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp81_ = sorted; -#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp82_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp83_ = _tmp82_; -#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp80_ < (_tmp83_ - 1)) { -#line 12307 "BatchImport.c" - FileToPrepare* _tmp84_ = NULL; - GeeList* _tmp85_ = NULL; - gint _tmp86_ = 0; - gpointer _tmp87_ = NULL; - FileToPrepare* _tmp88_ = NULL; - gboolean _tmp89_ = FALSE; -#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 11779 "BatchImport.c" + FileToPrepare* _tmp84_; + GeeList* _tmp85_; + gint _tmp86_; + gpointer _tmp87_; + FileToPrepare* _tmp88_; + gboolean _tmp89_; +#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp84_ = ftp; -#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp85_ = sorted; -#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp86_ = i; -#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp87_ = gee_list_get (_tmp85_, _tmp86_ + 1); -#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp88_ = (FileToPrepare*) _tmp87_; -#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp89_ = work_sniffer_is_paired (self, _tmp84_, _tmp88_); -#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp79_ = _tmp89_; -#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (_tmp88_); -#line 12330 "BatchImport.c" +#line 11802 "BatchImport.c" } else { -#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp79_ = FALSE; -#line 12334 "BatchImport.c" +#line 11806 "BatchImport.c" } -#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp79_) { -#line 12338 "BatchImport.c" +#line 11810 "BatchImport.c" FileToPrepare* associated_file = NULL; - GeeList* _tmp90_ = NULL; - gint _tmp91_ = 0; - gpointer _tmp92_ = NULL; - GeeList* _tmp93_ = NULL; - FileToPrepare* _tmp94_ = NULL; - FileToPrepare* _tmp95_ = NULL; - FileToPrepare* _tmp96_ = NULL; -#line 1509 "/home/jens/Source/shotwell/src/BatchImport.vala" + GeeList* _tmp90_; + gint _tmp91_; + gpointer _tmp92_; + GeeList* _tmp93_; + FileToPrepare* _tmp94_; + FileToPrepare* _tmp95_; + FileToPrepare* _tmp96_; +#line 1516 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp90_ = sorted; -#line 1509 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1516 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp91_ = i; -#line 1509 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1516 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp92_ = gee_list_get (_tmp90_, _tmp91_ + 1); -#line 1509 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1516 "/home/jens/Source/shotwell/src/BatchImport.vala" associated_file = (FileToPrepare*) _tmp92_; -#line 1510 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp93_ = self->files_to_prepare; -#line 1510 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp94_ = associated_file; -#line 1510 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, GEE_TYPE_COLLECTION, GeeCollection), _tmp94_); -#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1518 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp95_ = ftp; -#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1518 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp96_ = associated_file; -#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1518 "/home/jens/Source/shotwell/src/BatchImport.vala" file_to_prepare_set_associated (_tmp95_, _tmp96_); -#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (associated_file); -#line 12369 "BatchImport.c" +#line 11841 "BatchImport.c" } } } -#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (ftp); -#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (ext); -#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (name); -#line 12379 "BatchImport.c" +#line 11851 "BatchImport.c" } } } -#line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (sorted); -#line 12385 "BatchImport.c" +#line 11857 "BatchImport.c" } static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, FileToPrepare* maybe_paired) { gboolean result = FALSE; - FileToPrepare* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - FileToPrepare* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + FileToPrepare* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + FileToPrepare* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gboolean _tmp6_; gchar* name = NULL; gchar* ext = NULL; gchar* test_name = NULL; gchar* test_ext = NULL; - FileToPrepare* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; + FileToPrepare* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_ = NULL; gchar* _tmp11_ = NULL; - JfifFileFormatProperties* _tmp12_ = NULL; - JfifFileFormatProperties* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; - gboolean _tmp16_ = FALSE; - FileToPrepare* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; + JfifFileFormatProperties* _tmp12_; + JfifFileFormatProperties* _tmp13_; + const gchar* _tmp14_; + gboolean _tmp15_; + gboolean _tmp16_; + FileToPrepare* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; -#line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala" + const gchar* _tmp22_; + const gchar* _tmp23_; +#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_WORK_SNIFFER (self), FALSE); -#line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_FILE_TO_PREPARE (raw), FALSE); -#line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_FILE_TO_PREPARE (maybe_paired), FALSE); -#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = raw; -#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = file_to_prepare_get_parent_path (_tmp0_); -#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = _tmp1_; -#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = maybe_paired; -#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = file_to_prepare_get_parent_path (_tmp3_); -#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = _tmp4_; -#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = g_strcmp0 (_tmp2_, _tmp5_) != 0; -#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp5_); -#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp2_); -#line 1521 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp6_) { -#line 1522 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1529 "/home/jens/Source/shotwell/src/BatchImport.vala" result = FALSE; -#line 1522 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1529 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 12449 "BatchImport.c" +#line 11921 "BatchImport.c" } -#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = maybe_paired; -#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = file_to_prepare_get_basename (_tmp7_); -#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = _tmp8_; -#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" disassemble_filename (_tmp9_, &_tmp10_, &_tmp11_); -#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (test_name); -#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" test_name = _tmp10_; -#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (test_ext); -#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" test_ext = _tmp11_; -#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp9_); -#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = jfif_file_format_properties_get_instance (); -#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = _tmp12_; -#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = test_ext; -#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp15_ = photo_file_format_properties_is_recognized_extension (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties), _tmp14_); -#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp16_ = !_tmp15_; -#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala" _photo_file_format_properties_unref0 (_tmp13_); -#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp16_) { -#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala" result = FALSE; -#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (test_ext); -#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (test_name); -#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (ext); -#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (name); -#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 12495 "BatchImport.c" +#line 11967 "BatchImport.c" } -#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp17_ = raw; -#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp18_ = file_to_prepare_get_basename (_tmp17_); -#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp19_ = _tmp18_; -#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala" disassemble_filename (_tmp19_, &_tmp20_, &_tmp21_); -#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (name); -#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala" name = _tmp20_; -#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (ext); -#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala" ext = _tmp21_; -#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp19_); -#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp22_ = name; -#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp23_ = test_name; -#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala" result = g_strcmp0 (_tmp22_, _tmp23_) == 0; -#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (test_ext); -#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (test_name); -#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (ext); -#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (name); -#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 12531 "BatchImport.c" +#line 12003 "BatchImport.c" } @@ -12542,747 +12014,747 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr guint64 size = 0ULL; GFile* file_or_dir = NULL; gboolean determined_size = FALSE; - BatchImportJob* _tmp0_ = NULL; + BatchImportJob* _tmp0_; guint64 _tmp1_ = 0ULL; GFile* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; - BatchImportJob* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + gboolean _tmp3_; + gboolean _tmp4_; + BatchImportJob* _tmp7_; + gboolean _tmp8_; GError * _inner_error_ = NULL; -#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_WORK_SNIFFER (self)); -#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT_JOB (job)); -#line 1538 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = job; -#line 1538 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = batch_import_job_determine_file_size (_tmp0_, &_tmp1_, &_tmp2_); -#line 1538 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala" size = _tmp1_; -#line 1538 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (file_or_dir); -#line 1538 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala" file_or_dir = _tmp2_; -#line 1538 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala" determined_size = _tmp3_; -#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1546 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = determined_size; -#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1546 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp4_) { -#line 12567 "BatchImport.c" - guint64 _tmp5_ = 0ULL; - guint64 _tmp6_ = 0ULL; -#line 1540 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 12039 "BatchImport.c" + guint64 _tmp5_; + guint64 _tmp6_; +#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = self->total_bytes; -#line 1540 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = size; -#line 1540 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala" self->total_bytes = _tmp5_ + _tmp6_; -#line 12576 "BatchImport.c" +#line 12048 "BatchImport.c" } -#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = job; -#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = batch_import_job_is_directory (_tmp7_); -#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp8_) { -#line 12584 "BatchImport.c" +#line 12056 "BatchImport.c" GFile* dir = NULL; gboolean copy_to_library = FALSE; gboolean _tmp9_ = FALSE; - BatchImportJob* _tmp10_ = NULL; + BatchImportJob* _tmp10_; GFile* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; - gboolean _tmp13_ = FALSE; - GFile* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; -#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala" + gboolean _tmp13_; + GFile* _tmp21_; + gboolean _tmp22_; +#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = job; -#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = batch_import_job_prepare (_tmp10_, &_tmp11_, &_tmp12_, &_inner_error_); -#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (dir); -#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" dir = _tmp11_; -#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" copy_to_library = _tmp12_; -#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = _tmp13_; -#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" g_propagate_error (error, _inner_error_); -#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (dir); -#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (file_or_dir); -#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 12616 "BatchImport.c" +#line 12088 "BatchImport.c" } -#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!_tmp9_) { -#line 12620 "BatchImport.c" - BatchImportJob* _tmp14_ = NULL; - BatchImportJob* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - BatchImportJob* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; -#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 12092 "BatchImport.c" + BatchImportJob* _tmp14_; + BatchImportJob* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + BatchImportJob* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; +#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = job; -#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp15_ = job; -#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp16_ = batch_import_job_get_source_identifier (_tmp15_); -#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp17_ = _tmp16_; -#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp18_ = job; -#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp19_ = batch_import_job_get_dest_identifier (_tmp18_); -#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp20_ = _tmp19_; -#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp14_, NULL, _tmp17_, _tmp20_, IMPORT_RESULT_FILE_ERROR); -#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp20_); -#line 1548 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp17_); -#line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (dir); -#line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (file_or_dir); -#line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 12654 "BatchImport.c" +#line 12126 "BatchImport.c" } -#line 1553 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1560 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp21_ = dir; -#line 1553 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1560 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp22_ = query_is_directory (_tmp21_); -#line 1553 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1560 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (_tmp22_, "query_is_directory(dir)"); -#line 12662 "BatchImport.c" +#line 12134 "BatchImport.c" { - BatchImportJob* _tmp23_ = NULL; - GFile* _tmp24_ = NULL; - gboolean _tmp25_ = FALSE; -#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImportJob* _tmp23_; + GFile* _tmp24_; + gboolean _tmp25_; +#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp23_ = job; -#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp24_ = dir; -#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp25_ = copy_to_library; -#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala" work_sniffer_search_dir (self, _tmp23_, _tmp24_, _tmp25_, &_inner_error_); -#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12677 "BatchImport.c" - goto __catch414_g_error; +#line 12149 "BatchImport.c" + goto __catch415_g_error; } } - goto __finally414; - __catch414_g_error: + goto __finally415; + __catch415_g_error: { GError* err = NULL; - BatchImportJob* _tmp26_ = NULL; - GFile* _tmp27_ = NULL; - BatchImportJob* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - GFile* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - GError* _tmp34_ = NULL; -#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImportJob* _tmp26_; + GFile* _tmp27_; + BatchImportJob* _tmp28_; + gchar* _tmp29_; + gchar* _tmp30_; + GFile* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; + GError* _tmp34_; +#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; -#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; -#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp26_ = job; -#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp27_ = dir; -#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp28_ = job; -#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp29_ = batch_import_job_get_source_identifier (_tmp28_); -#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp30_ = _tmp29_; -#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp31_ = dir; -#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp32_ = g_file_get_path (_tmp31_); -#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp33_ = _tmp32_; -#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp34_ = err; -#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala" background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp26_, _tmp27_, _tmp30_, _tmp33_, _tmp34_, IMPORT_RESULT_FILE_ERROR); -#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp33_); -#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp30_); -#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 12724 "BatchImport.c" +#line 12196 "BatchImport.c" } - __finally414: -#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" + __finally415: +#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala" g_propagate_error (error, _inner_error_); -#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (dir); -#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (file_or_dir); -#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 12737 "BatchImport.c" +#line 12209 "BatchImport.c" } -#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (dir); -#line 12741 "BatchImport.c" +#line 12213 "BatchImport.c" } else { - gboolean _tmp35_ = FALSE; + gboolean _tmp35_; gboolean _tmp43_ = FALSE; gboolean _tmp44_ = FALSE; - GFile* _tmp45_ = NULL; - GeeList* _tmp50_ = NULL; - BatchImportJob* _tmp51_ = NULL; - FileToPrepare* _tmp52_ = NULL; - FileToPrepare* _tmp53_ = NULL; -#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp45_; + GeeList* _tmp50_; + BatchImportJob* _tmp51_; + FileToPrepare* _tmp52_; + FileToPrepare* _tmp53_; +#line 1570 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp35_ = determined_size; -#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1570 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!_tmp35_) { -#line 12755 "BatchImport.c" +#line 12227 "BatchImport.c" guint64 _tmp36_ = 0ULL; - GFile* _tmp37_ = NULL; - GCancellable* _tmp38_ = NULL; - GCancellable* _tmp39_ = NULL; - guint64 _tmp40_ = 0ULL; - guint64 _tmp41_ = 0ULL; - guint64 _tmp42_ = 0ULL; -#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp37_; + GCancellable* _tmp38_; + GCancellable* _tmp39_; + guint64 _tmp40_; + guint64 _tmp41_; + guint64 _tmp42_; +#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp37_ = file_or_dir; -#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp38_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob)); -#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp39_ = _tmp38_; -#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp40_ = query_total_file_size (_tmp37_, _tmp39_, &_inner_error_); -#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp41_ = _tmp40_; -#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp39_); -#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp36_ = _tmp41_; -#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" g_propagate_error (error, _inner_error_); -#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (file_or_dir); -#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 12785 "BatchImport.c" +#line 12257 "BatchImport.c" } -#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp42_ = self->total_bytes; -#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" self->total_bytes = _tmp42_ + _tmp36_; -#line 12791 "BatchImport.c" +#line 12263 "BatchImport.c" } -#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp45_ = file_or_dir; -#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp45_ != NULL) { -#line 12797 "BatchImport.c" - GeeHashSet* _tmp46_ = NULL; -#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 12269 "BatchImport.c" + GeeHashSet* _tmp46_; +#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp46_ = self->priv->skipset; -#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp44_ = _tmp46_ != NULL; -#line 12803 "BatchImport.c" +#line 12275 "BatchImport.c" } else { -#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp44_ = FALSE; -#line 12807 "BatchImport.c" +#line 12279 "BatchImport.c" } -#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp44_) { -#line 12811 "BatchImport.c" - GeeHashSet* _tmp47_ = NULL; - GFile* _tmp48_ = NULL; - gboolean _tmp49_ = FALSE; -#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 12283 "BatchImport.c" + GeeHashSet* _tmp47_; + GFile* _tmp48_; + gboolean _tmp49_; +#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp47_ = self->priv->skipset; -#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp48_ = file_or_dir; -#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp49_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp48_); -#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp43_ = _tmp49_; -#line 12823 "BatchImport.c" +#line 12295 "BatchImport.c" } else { -#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp43_ = FALSE; -#line 12827 "BatchImport.c" +#line 12299 "BatchImport.c" } -#line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp43_) { -#line 1568 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (file_or_dir); -#line 1568 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 12835 "BatchImport.c" +#line 12307 "BatchImport.c" } -#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1578 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp50_ = self->files_to_prepare; -#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1578 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp51_ = job; -#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1578 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp52_ = file_to_prepare_new (_tmp51_, NULL, TRUE); -#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1578 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp53_ = _tmp52_; -#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1578 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection), _tmp53_); -#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1578 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (_tmp53_); -#line 12849 "BatchImport.c" +#line 12321 "BatchImport.c" } -#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (file_or_dir); -#line 12853 "BatchImport.c" +#line 12325 "BatchImport.c" } void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir, gboolean copy_to_library, GError** error) { GFileEnumerator* enumerator = NULL; - GFile* _tmp0_ = NULL; - GFileEnumerator* _tmp1_ = NULL; + GFile* _tmp0_; + GFileEnumerator* _tmp1_; GFileInfo* info = NULL; GError * _inner_error_ = NULL; -#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_WORK_SNIFFER (self)); -#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (IS_BATCH_IMPORT_JOB (job)); -#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 1576 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = dir; -#line 1576 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = g_file_enumerate_children (_tmp0_, "standard::*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_); -#line 1576 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala" enumerator = _tmp1_; -#line 1576 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1576 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala" g_propagate_error (error, _inner_error_); -#line 1576 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 12881 "BatchImport.c" +#line 12353 "BatchImport.c" } -#line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1586 "/home/jens/Source/shotwell/src/BatchImport.vala" info = NULL; -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 12887 "BatchImport.c" +#line 12359 "BatchImport.c" GFileInfo* _tmp2_ = NULL; - GFileEnumerator* _tmp3_ = NULL; - GCancellable* _tmp4_ = NULL; - GCancellable* _tmp5_ = NULL; - GFileInfo* _tmp6_ = NULL; - GFileInfo* _tmp7_ = NULL; - GFileInfo* _tmp8_ = NULL; - GFileInfo* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; + GFileEnumerator* _tmp3_; + GCancellable* _tmp4_; + GCancellable* _tmp5_; + GFileInfo* _tmp6_; + GFileInfo* _tmp7_; + GFileInfo* _tmp8_; + GFileInfo* _tmp9_; + gboolean _tmp10_; GFile* child = NULL; - GFile* _tmp11_ = NULL; - GFileInfo* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; + GFile* _tmp11_; + GFileInfo* _tmp12_; + const gchar* _tmp13_; + GFile* _tmp14_; GFileType file_type = 0; - GFileInfo* _tmp15_ = NULL; - GFileType _tmp16_ = 0; - GFileType _tmp17_ = 0; -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFileInfo* _tmp15_; + GFileType _tmp16_; + GFileType _tmp17_; +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = enumerator; -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob)); -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = _tmp4_; -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = g_file_enumerator_next_file (_tmp3_, _tmp5_, &_inner_error_); -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = _tmp6_; -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp5_); -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = _tmp7_; -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" g_propagate_error (error, _inner_error_); -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (info); -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (enumerator); -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 12930 "BatchImport.c" +#line 12402 "BatchImport.c" } -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = _tmp2_; -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = NULL; -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (info); -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" info = _tmp8_; -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = info; -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!(_tmp9_ != NULL)) { -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp2_); -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 12948 "BatchImport.c" +#line 12420 "BatchImport.c" } -#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1589 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob)); -#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1589 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp10_) { -#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1590 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp2_); -#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1590 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 12958 "BatchImport.c" +#line 12430 "BatchImport.c" } -#line 1585 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = dir; -#line 1585 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = info; -#line 1585 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = g_file_info_get_name (_tmp12_); -#line 1585 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = g_file_get_child (_tmp11_, _tmp13_); -#line 1585 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" child = _tmp14_; -#line 1586 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp15_ = info; -#line 1586 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp16_ = g_file_info_get_file_type (_tmp15_); -#line 1586 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala" file_type = _tmp16_; -#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp17_ = file_type; -#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp17_ == G_FILE_TYPE_DIRECTORY) { -#line 12980 "BatchImport.c" - GFileInfo* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; -#line 1589 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 12452 "BatchImport.c" + GFileInfo* _tmp18_; + const gchar* _tmp19_; + gboolean _tmp20_; +#line 1596 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp18_ = info; -#line 1589 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1596 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp19_ = g_file_info_get_name (_tmp18_); -#line 1589 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1596 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp20_ = g_str_has_prefix (_tmp19_, "."); -#line 1589 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1596 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp20_) { -#line 1590 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1597 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (child); -#line 1590 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1597 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp2_); -#line 1590 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1597 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 12998 "BatchImport.c" +#line 12470 "BatchImport.c" } { - BatchImportJob* _tmp21_ = NULL; - GFile* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; -#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImportJob* _tmp21_; + GFile* _tmp22_; + gboolean _tmp23_; +#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp21_ = job; -#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp22_ = child; -#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp23_ = copy_to_library; -#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala" work_sniffer_search_dir (self, _tmp21_, _tmp22_, _tmp23_, &_inner_error_); -#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 13014 "BatchImport.c" - goto __catch415_g_error; +#line 12486 "BatchImport.c" + goto __catch416_g_error; } } - goto __finally415; - __catch415_g_error: + goto __finally416; + __catch416_g_error: { GError* err = NULL; - BatchImportJob* _tmp24_ = NULL; - GFile* _tmp25_ = NULL; - GFile* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - GFile* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - GError* _tmp32_ = NULL; -#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImportJob* _tmp24_; + GFile* _tmp25_; + GFile* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + GFile* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + GError* _tmp32_; +#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; -#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; -#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp24_ = job; -#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp25_ = child; -#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp26_ = child; -#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp27_ = g_file_get_path (_tmp26_); -#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp28_ = _tmp27_; -#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp29_ = child; -#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp30_ = g_file_get_path (_tmp29_); -#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp31_ = _tmp30_; -#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp32_ = err; -#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp24_, _tmp25_, _tmp28_, _tmp31_, _tmp32_, IMPORT_RESULT_FILE_ERROR); -#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp31_); -#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp28_); -#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 13061 "BatchImport.c" +#line 12533 "BatchImport.c" } - __finally415: -#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" + __finally416: +#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" g_propagate_error (error, _inner_error_); -#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (child); -#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp2_); -#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (info); -#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (enumerator); -#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 13078 "BatchImport.c" +#line 12550 "BatchImport.c" } } else { - GFileType _tmp33_ = 0; -#line 1598 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFileType _tmp33_; +#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp33_ = file_type; -#line 1598 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp33_ == G_FILE_TYPE_REGULAR) { -#line 13086 "BatchImport.c" +#line 12558 "BatchImport.c" gboolean _tmp34_ = FALSE; - GeeHashSet* _tmp35_ = NULL; + GeeHashSet* _tmp35_; gboolean _tmp39_ = FALSE; gboolean _tmp40_ = FALSE; - GFile* _tmp41_ = NULL; - gboolean _tmp42_ = FALSE; -#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp41_; + gboolean _tmp42_; +#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp35_ = self->priv->skipset; -#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp35_ != NULL) { -#line 13097 "BatchImport.c" - GeeHashSet* _tmp36_ = NULL; - GFile* _tmp37_ = NULL; - gboolean _tmp38_ = FALSE; -#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 12569 "BatchImport.c" + GeeHashSet* _tmp36_; + GFile* _tmp37_; + gboolean _tmp38_; +#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp36_ = self->priv->skipset; -#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp37_ = child; -#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp38_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp37_); -#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp34_ = _tmp38_; -#line 13109 "BatchImport.c" +#line 12581 "BatchImport.c" } else { -#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp34_ = FALSE; -#line 13113 "BatchImport.c" +#line 12585 "BatchImport.c" } -#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp34_) { -#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (child); -#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp2_); -#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 13123 "BatchImport.c" +#line 12595 "BatchImport.c" } -#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp41_ = child; -#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp42_ = photo_is_file_image (_tmp41_); -#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp42_) { -#line 13131 "BatchImport.c" - GFile* _tmp43_ = NULL; - gboolean _tmp44_ = FALSE; -#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 12603 "BatchImport.c" + GFile* _tmp43_; + gboolean _tmp44_; +#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp43_ = child; -#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp44_ = photo_file_format_is_file_supported (_tmp43_); -#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp40_ = _tmp44_; -#line 13140 "BatchImport.c" +#line 12612 "BatchImport.c" } else { -#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp40_ = FALSE; -#line 13144 "BatchImport.c" +#line 12616 "BatchImport.c" } -#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp40_) { -#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp39_ = TRUE; -#line 13150 "BatchImport.c" +#line 12622 "BatchImport.c" } else { - GFile* _tmp45_ = NULL; - gboolean _tmp46_ = FALSE; -#line 1603 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp45_; + gboolean _tmp46_; +#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp45_ = child; -#line 1603 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp46_ = video_reader_is_supported_video_file (_tmp45_); -#line 1603 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp39_ = _tmp46_; -#line 13160 "BatchImport.c" +#line 12632 "BatchImport.c" } -#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp39_) { -#line 13164 "BatchImport.c" - guint64 _tmp47_ = 0ULL; - GFileInfo* _tmp48_ = NULL; - gint64 _tmp49_ = 0LL; - GeeList* _tmp50_ = NULL; - BatchImportJob* _tmp51_ = NULL; - GFile* _tmp52_ = NULL; - gboolean _tmp53_ = FALSE; - FileToPrepare* _tmp54_ = NULL; - FileToPrepare* _tmp55_ = NULL; -#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 12636 "BatchImport.c" + guint64 _tmp47_; + GFileInfo* _tmp48_; + gint64 _tmp49_; + GeeList* _tmp50_; + BatchImportJob* _tmp51_; + GFile* _tmp52_; + gboolean _tmp53_; + FileToPrepare* _tmp54_; + FileToPrepare* _tmp55_; +#line 1611 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp47_ = self->total_bytes; -#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1611 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp48_ = info; -#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1611 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp49_ = g_file_info_get_size (_tmp48_); -#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1611 "/home/jens/Source/shotwell/src/BatchImport.vala" self->total_bytes = _tmp47_ + _tmp49_; -#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp50_ = self->files_to_prepare; -#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp51_ = job; -#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp52_ = child; -#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp53_ = copy_to_library; -#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp54_ = file_to_prepare_new (_tmp51_, _tmp52_, _tmp53_); -#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp55_ = _tmp54_; -#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection), _tmp55_); -#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (_tmp55_); -#line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1614 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (child); -#line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1614 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp2_); -#line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1614 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 13204 "BatchImport.c" +#line 12676 "BatchImport.c" } } else { - GFile* _tmp56_ = NULL; - gchar* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - GFileType _tmp59_ = 0; -#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp56_; + gchar* _tmp57_; + gchar* _tmp58_; + GFileType _tmp59_; +#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp56_ = child; -#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp57_ = g_file_get_path (_tmp56_); -#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp58_ = _tmp57_; -#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp59_ = file_type; -#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_warning ("BatchImport.vala:1610: Ignoring import of %s file type %d", _tmp58_, (gint) _tmp59_); -#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala" + g_warning ("BatchImport.vala:1617: Ignoring import of %s file type %d", _tmp58_, (gint) _tmp59_); +#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp58_); -#line 13223 "BatchImport.c" +#line 12695 "BatchImport.c" } } -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (child); -#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp2_); -#line 13230 "BatchImport.c" +#line 12702 "BatchImport.c" } -#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (info); -#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (enumerator); -#line 13236 "BatchImport.c" +#line 12708 "BatchImport.c" } static void work_sniffer_class_init (WorkSnifferClass * klass) { -#line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala" work_sniffer_parent_class = g_type_class_peek_parent (klass); -#line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala" ((BackgroundJobClass *) klass)->finalize = work_sniffer_finalize; -#line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_class_add_private (klass, sizeof (WorkSnifferPrivate)); -#line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) work_sniffer_real_execute; -#line 13249 "BatchImport.c" +#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala" + ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) work_sniffer_real_execute; +#line 12721 "BatchImport.c" } static void work_sniffer_instance_init (WorkSniffer * self) { - GeeArrayList* _tmp0_ = NULL; -#line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala" + GeeArrayList* _tmp0_; +#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv = WORK_SNIFFER_GET_PRIVATE (self); -#line 1437 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1444 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = gee_array_list_new (TYPE_FILE_TO_PREPARE, (GBoxedCopyFunc) file_to_prepare_ref, (GDestroyNotify) file_to_prepare_unref, NULL, NULL, NULL); -#line 1437 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1444 "/home/jens/Source/shotwell/src/BatchImport.vala" self->files_to_prepare = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList); -#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1445 "/home/jens/Source/shotwell/src/BatchImport.vala" self->total_bytes = (guint64) 0; -#line 13263 "BatchImport.c" +#line 12735 "BatchImport.c" } -static void work_sniffer_finalize (BackgroundJob* obj) { +static void work_sniffer_finalize (BackgroundJob * obj) { WorkSniffer * self; -#line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_WORK_SNIFFER, WorkSniffer); -#line 1437 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1444 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->files_to_prepare); -#line 1440 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1447 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->jobs); -#line 1441 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1448 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->skipset); -#line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala" BACKGROUND_JOB_CLASS (work_sniffer_parent_class)->finalize (obj); -#line 13279 "BatchImport.c" +#line 12751 "BatchImport.c" } @@ -13300,354 +12772,354 @@ GType work_sniffer_get_type (void) { PreparedFile* prepared_file_construct (GType object_type, BatchImportJob* job, GFile* file, GFile* associated_file, const gchar* source_id, const gchar* dest_id, gboolean copy_to_library, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, guint64 filesize, gboolean is_video) { PreparedFile* self = NULL; - BatchImportJob* _tmp0_ = NULL; - BatchImportJob* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - PhotoFileFormat _tmp17_ = 0; - guint64 _tmp18_ = 0ULL; - gboolean _tmp19_ = FALSE; -#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImportJob* _tmp0_; + BatchImportJob* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; + GFile* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; + gboolean _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + PhotoFileFormat _tmp17_; + guint64 _tmp18_; + gboolean _tmp19_; +#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL); -#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail ((associated_file == NULL) || G_IS_FILE (associated_file), NULL); -#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (source_id != NULL, NULL); -#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (dest_id != NULL, NULL); -#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (PreparedFile*) g_type_create_instance (object_type); -#line 1634 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = job; -#line 1634 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = _batch_import_job_ref0 (_tmp0_); -#line 1634 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (self->job); -#line 1634 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala" self->job = _tmp1_; -#line 1635 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1642 "/home/jens/Source/shotwell/src/BatchImport.vala" self->result = IMPORT_RESULT_SUCCESS; -#line 1636 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = file; -#line 1636 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = _g_object_ref0 (_tmp2_); -#line 1636 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->file); -#line 1636 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" self->file = _tmp3_; -#line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1644 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = associated_file; -#line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1644 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1644 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->associated_file); -#line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1644 "/home/jens/Source/shotwell/src/BatchImport.vala" self->associated_file = _tmp5_; -#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1645 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = source_id; -#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1645 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = g_strdup (_tmp6_); -#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1645 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->source_id); -#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1645 "/home/jens/Source/shotwell/src/BatchImport.vala" self->source_id = _tmp7_; -#line 1639 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1646 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = dest_id; -#line 1639 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1646 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = g_strdup (_tmp8_); -#line 1639 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1646 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->dest_id); -#line 1639 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1646 "/home/jens/Source/shotwell/src/BatchImport.vala" self->dest_id = _tmp9_; -#line 1640 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1647 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = copy_to_library; -#line 1640 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1647 "/home/jens/Source/shotwell/src/BatchImport.vala" self->copy_to_library = _tmp10_; -#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1648 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = exif_md5; -#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1648 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = g_strdup (_tmp11_); -#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1648 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->exif_md5); -#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1648 "/home/jens/Source/shotwell/src/BatchImport.vala" self->exif_md5 = _tmp12_; -#line 1642 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1649 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = thumbnail_md5; -#line 1642 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1649 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = g_strdup (_tmp13_); -#line 1642 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1649 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->thumbnail_md5); -#line 1642 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1649 "/home/jens/Source/shotwell/src/BatchImport.vala" self->thumbnail_md5 = _tmp14_; -#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp15_ = full_md5; -#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp16_ = g_strdup (_tmp15_); -#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->full_md5); -#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala" self->full_md5 = _tmp16_; -#line 1644 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1651 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp17_ = file_format; -#line 1644 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1651 "/home/jens/Source/shotwell/src/BatchImport.vala" self->file_format = _tmp17_; -#line 1645 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1652 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp18_ = filesize; -#line 1645 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1652 "/home/jens/Source/shotwell/src/BatchImport.vala" self->filesize = _tmp18_; -#line 1646 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp19_ = is_video; -#line 1646 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala" self->is_video = _tmp19_; -#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 13413 "BatchImport.c" +#line 12885 "BatchImport.c" } PreparedFile* prepared_file_new (BatchImportJob* job, GFile* file, GFile* associated_file, const gchar* source_id, const gchar* dest_id, gboolean copy_to_library, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, guint64 filesize, gboolean is_video) { -#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala" return prepared_file_construct (TYPE_PREPARED_FILE, job, file, associated_file, source_id, dest_id, copy_to_library, exif_md5, thumbnail_md5, full_md5, file_format, filesize, is_video); -#line 13420 "BatchImport.c" +#line 12892 "BatchImport.c" } static void value_prepared_file_init (GValue* value) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 13427 "BatchImport.c" +#line 12899 "BatchImport.c" } static void value_prepared_file_free_value (GValue* value) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" if (value->data[0].v_pointer) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" prepared_file_unref (value->data[0].v_pointer); -#line 13436 "BatchImport.c" +#line 12908 "BatchImport.c" } } static void value_prepared_file_copy_value (const GValue* src_value, GValue* dest_value) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" if (src_value->data[0].v_pointer) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = prepared_file_ref (src_value->data[0].v_pointer); -#line 13446 "BatchImport.c" +#line 12918 "BatchImport.c" } else { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = NULL; -#line 13450 "BatchImport.c" +#line 12922 "BatchImport.c" } } static gpointer value_prepared_file_peek_pointer (const GValue* value) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 13458 "BatchImport.c" +#line 12930 "BatchImport.c" } static gchar* value_prepared_file_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" if (collect_values[0].v_pointer) { -#line 13465 "BatchImport.c" - PreparedFile* object; +#line 12937 "BatchImport.c" + PreparedFile * object; object = collect_values[0].v_pointer; -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" if (object->parent_instance.g_class == NULL) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 13472 "BatchImport.c" +#line 12944 "BatchImport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 13476 "BatchImport.c" +#line 12948 "BatchImport.c" } -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = prepared_file_ref (object); -#line 13480 "BatchImport.c" +#line 12952 "BatchImport.c" } else { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 13484 "BatchImport.c" +#line 12956 "BatchImport.c" } -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 13488 "BatchImport.c" +#line 12960 "BatchImport.c" } static gchar* value_prepared_file_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PreparedFile** object_p; + PreparedFile ** object_p; object_p = collect_values[0].v_pointer; -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!object_p) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 13499 "BatchImport.c" +#line 12971 "BatchImport.c" } -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!value->data[0].v_pointer) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = NULL; -#line 13505 "BatchImport.c" +#line 12977 "BatchImport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = value->data[0].v_pointer; -#line 13509 "BatchImport.c" +#line 12981 "BatchImport.c" } else { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = prepared_file_ref (value->data[0].v_pointer); -#line 13513 "BatchImport.c" +#line 12985 "BatchImport.c" } -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 13517 "BatchImport.c" +#line 12989 "BatchImport.c" } GParamSpec* param_spec_prepared_file (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { ParamSpecPreparedFile* spec; -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PREPARED_FILE), NULL); -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" return G_PARAM_SPEC (spec); -#line 13531 "BatchImport.c" +#line 13003 "BatchImport.c" } gpointer value_get_prepared_file (const GValue* value) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREPARED_FILE), NULL); -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 13540 "BatchImport.c" +#line 13012 "BatchImport.c" } void value_set_prepared_file (GValue* value, gpointer v_object) { - PreparedFile* old; -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" + PreparedFile * old; +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREPARED_FILE)); -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" old = value->data[0].v_pointer; -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" if (v_object) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PREPARED_FILE)); -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" prepared_file_ref (value->data[0].v_pointer); -#line 13560 "BatchImport.c" +#line 13032 "BatchImport.c" } else { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 13564 "BatchImport.c" +#line 13036 "BatchImport.c" } -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" prepared_file_unref (old); -#line 13570 "BatchImport.c" +#line 13042 "BatchImport.c" } } void value_take_prepared_file (GValue* value, gpointer v_object) { - PreparedFile* old; -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" + PreparedFile * old; +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREPARED_FILE)); -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" old = value->data[0].v_pointer; -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" if (v_object) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PREPARED_FILE)); -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 13589 "BatchImport.c" +#line 13061 "BatchImport.c" } else { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 13593 "BatchImport.c" +#line 13065 "BatchImport.c" } -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" prepared_file_unref (old); -#line 13599 "BatchImport.c" +#line 13071 "BatchImport.c" } } static void prepared_file_class_init (PreparedFileClass * klass) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" prepared_file_parent_class = g_type_class_peek_parent (klass); -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" ((PreparedFileClass *) klass)->finalize = prepared_file_finalize; -#line 13609 "BatchImport.c" +#line 13081 "BatchImport.c" } static void prepared_file_instance_init (PreparedFile * self) { -#line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1627 "/home/jens/Source/shotwell/src/BatchImport.vala" self->associated_file = NULL; -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ref_count = 1; -#line 13618 "BatchImport.c" +#line 13090 "BatchImport.c" } -static void prepared_file_finalize (PreparedFile* obj) { +static void prepared_file_finalize (PreparedFile * obj) { PreparedFile * self; -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARED_FILE, PreparedFile); -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" g_signal_handlers_destroy (self); -#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1624 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (self->job); -#line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->file); -#line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1627 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->associated_file); -#line 1621 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1628 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->source_id); -#line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->dest_id); -#line 1624 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->exif_md5); -#line 1625 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->thumbnail_md5); -#line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1633 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (self->full_md5); -#line 13644 "BatchImport.c" +#line 13116 "BatchImport.c" } @@ -13666,65 +13138,65 @@ GType prepared_file_get_type (void) { gpointer prepared_file_ref (gpointer instance) { - PreparedFile* self; + PreparedFile * self; self = instance; -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" g_atomic_int_inc (&self->ref_count); -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" return instance; -#line 13669 "BatchImport.c" +#line 13141 "BatchImport.c" } void prepared_file_unref (gpointer instance) { - PreparedFile* self; + PreparedFile * self; self = instance; -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" PREPARED_FILE_GET_CLASS (self)->finalize (self); -#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 13682 "BatchImport.c" +#line 13154 "BatchImport.c" } } PreparedFileCluster* prepared_file_cluster_construct (GType object_type, GeeArrayList* list) { PreparedFileCluster* self = NULL; - GeeArrayList* _tmp0_ = NULL; - GeeArrayList* _tmp1_ = NULL; -#line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala" + GeeArrayList* _tmp0_; + GeeArrayList* _tmp1_; +#line 1660 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (GEE_IS_ARRAY_LIST (list), NULL); -#line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1660 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (PreparedFileCluster*) interlocked_notification_object_construct (object_type); -#line 1654 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = list; -#line 1654 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 1654 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->list); -#line 1654 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala" self->list = _tmp1_; -#line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1660 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 13705 "BatchImport.c" +#line 13177 "BatchImport.c" } PreparedFileCluster* prepared_file_cluster_new (GeeArrayList* list) { -#line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1660 "/home/jens/Source/shotwell/src/BatchImport.vala" return prepared_file_cluster_construct (TYPE_PREPARED_FILE_CLUSTER, list); -#line 13712 "BatchImport.c" +#line 13184 "BatchImport.c" } static void prepared_file_cluster_class_init (PreparedFileClusterClass * klass) { -#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1657 "/home/jens/Source/shotwell/src/BatchImport.vala" prepared_file_cluster_parent_class = g_type_class_peek_parent (klass); -#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1657 "/home/jens/Source/shotwell/src/BatchImport.vala" ((NotificationObjectClass *) klass)->finalize = prepared_file_cluster_finalize; -#line 13721 "BatchImport.c" +#line 13193 "BatchImport.c" } @@ -13732,15 +13204,15 @@ static void prepared_file_cluster_instance_init (PreparedFileCluster * self) { } -static void prepared_file_cluster_finalize (NotificationObject* obj) { +static void prepared_file_cluster_finalize (NotificationObject * obj) { PreparedFileCluster * self; -#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1657 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARED_FILE_CLUSTER, PreparedFileCluster); -#line 1651 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->list); -#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1657 "/home/jens/Source/shotwell/src/BatchImport.vala" NOTIFICATION_OBJECT_CLASS (prepared_file_cluster_parent_class)->finalize (obj); -#line 13737 "BatchImport.c" +#line 13209 "BatchImport.c" } @@ -13758,1836 +13230,1836 @@ GType prepared_file_cluster_get_type (void) { PrepareFilesJob* prepare_files_job_construct (GType object_type, BatchImport* owner, GeeList* files_to_prepare, NotificationCallback notification, void* notification_target, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) { PrepareFilesJob* self = NULL; - BatchImport* _tmp0_ = NULL; - CompletionCallback _tmp1_ = NULL; - void* _tmp1__target = NULL; - GCancellable* _tmp2_ = NULL; - CancellationCallback _tmp3_ = NULL; - void* _tmp3__target = NULL; - GeeList* _tmp4_ = NULL; - GeeList* _tmp5_ = NULL; - NotificationCallback _tmp6_ = NULL; - void* _tmp6__target = NULL; - GFile* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; -#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImport* _tmp0_; + CompletionCallback _tmp1_; + void* _tmp1__target; + GCancellable* _tmp2_; + CancellationCallback _tmp3_; + void* _tmp3__target; + GeeList* _tmp4_; + GeeList* _tmp5_; + NotificationCallback _tmp6_; + void* _tmp6__target; + GFile* _tmp7_; + gint _tmp8_; + gint _tmp9_; +#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL); -#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (GEE_IS_LIST (files_to_prepare), NULL); -#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL); -#line 1674 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = owner; -#line 1674 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = callback; -#line 1674 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1__target = callback_target; -#line 1674 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = cancellable; -#line 1674 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = cancellation; -#line 1674 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3__target = cancellation_target; -#line 1674 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (PrepareFilesJob*) background_import_job_construct (object_type, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target); -#line 1676 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1683 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = files_to_prepare; -#line 1676 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1683 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 1676 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1683 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->files_to_prepare); -#line 1676 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1683 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->files_to_prepare = _tmp5_; -#line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1684 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = notification; -#line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1684 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6__target = notification_target; -#line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1684 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->notification = _tmp6_; -#line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1684 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->notification_target = _tmp6__target; -#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = app_dirs_get_import_dir (); -#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->library_dir); -#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->library_dir = _tmp7_; -#line 1679 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1686 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = prepare_files_job_get_test_variable ("SHOTWELL_FAIL_EVERY"); -#line 1679 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1686 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->fail_every = _tmp8_; -#line 1680 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1687 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = prepare_files_job_get_test_variable ("SHOTWELL_SKIP_EVERY"); -#line 1680 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1687 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->skip_every = _tmp9_; -#line 1682 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1689 "/home/jens/Source/shotwell/src/BatchImport.vala" background_job_set_notification_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW); -#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 13822 "BatchImport.c" +#line 13294 "BatchImport.c" } PrepareFilesJob* prepare_files_job_new (BatchImport* owner, GeeList* files_to_prepare, NotificationCallback notification, void* notification_target, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) { -#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala" return prepare_files_job_construct (TYPE_PREPARE_FILES_JOB, owner, files_to_prepare, notification, notification_target, callback, callback_target, cancellable, cancellation, cancellation_target); -#line 13829 "BatchImport.c" +#line 13301 "BatchImport.c" } static gint prepare_files_job_get_test_variable (const gchar* name) { gint result = 0; gchar* value = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; gint _tmp3_ = 0; gboolean _tmp4_ = FALSE; - const gchar* _tmp5_ = NULL; -#line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala" + const gchar* _tmp5_; +#line 1692 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (name != NULL, 0); -#line 1686 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1693 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = name; -#line 1686 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1693 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = g_getenv (_tmp0_); -#line 1686 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1693 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = g_strdup (_tmp1_); -#line 1686 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1693 "/home/jens/Source/shotwell/src/BatchImport.vala" value = _tmp2_; -#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = value; -#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp5_ == NULL) { -#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = TRUE; -#line 13858 "BatchImport.c" +#line 13330 "BatchImport.c" } else { - const gchar* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; -#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala" + const gchar* _tmp6_; + gint _tmp7_; + gint _tmp8_; +#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = value; -#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = strlen (_tmp6_); -#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = _tmp7_; -#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = _tmp8_ == 0; -#line 13871 "BatchImport.c" +#line 13343 "BatchImport.c" } -#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp4_) { -#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = 0; -#line 13877 "BatchImport.c" +#line 13349 "BatchImport.c" } else { - const gchar* _tmp9_ = NULL; - gint _tmp10_ = 0; -#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala" + const gchar* _tmp9_; + gint _tmp10_; +#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = value; -#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = atoi (_tmp9_); -#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = _tmp10_; -#line 13887 "BatchImport.c" +#line 13359 "BatchImport.c" } -#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp3_; -#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (value); -#line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 13895 "BatchImport.c" +#line 13367 "BatchImport.c" } static void prepare_files_job_real_execute (BackgroundJob* base) { PrepareFilesJob * self; GTimer* timer = NULL; - GTimer* _tmp0_ = NULL; + GTimer* _tmp0_; GeeArrayList* list = NULL; - GeeArrayList* _tmp1_ = NULL; - GeeArrayList* _tmp90_ = NULL; - gint _tmp91_ = 0; - gint _tmp92_ = 0; -#line 1691 "/home/jens/Source/shotwell/src/BatchImport.vala" + GeeArrayList* _tmp1_; + GeeArrayList* _tmp90_; + gint _tmp91_; + gint _tmp92_; +#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PREPARE_FILES_JOB, PrepareFilesJob); -#line 1692 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1699 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = g_timer_new (); -#line 1692 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1699 "/home/jens/Source/shotwell/src/BatchImport.vala" timer = _tmp0_; -#line 1694 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = gee_array_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL); -#line 1694 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala" list = _tmp1_; -#line 13918 "BatchImport.c" +#line 13390 "BatchImport.c" { GeeList* _file_to_prepare_list = NULL; - GeeList* _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; + GeeList* _tmp2_; + GeeList* _tmp3_; gint _file_to_prepare_size = 0; - GeeList* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; + GeeList* _tmp4_; + gint _tmp5_; + gint _tmp6_; gint _file_to_prepare_index = 0; -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = self->priv->files_to_prepare; -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = _g_object_ref0 (_tmp2_); -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_list = _tmp3_; -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = _file_to_prepare_list; -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = _tmp5_; -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_size = _tmp6_; -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_index = -1; -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 13946 "BatchImport.c" - gint _tmp7_ = 0; - gint _tmp8_ = 0; - gint _tmp9_ = 0; +#line 13418 "BatchImport.c" + gint _tmp7_; + gint _tmp8_; + gint _tmp9_; FileToPrepare* file_to_prepare = NULL; - GeeList* _tmp10_ = NULL; - gint _tmp11_ = 0; - gpointer _tmp12_ = NULL; + GeeList* _tmp10_; + gint _tmp11_; + gpointer _tmp12_; ImportResult _result_ = 0; - ImportResult _tmp13_ = 0; - ImportResult _tmp14_ = 0; + ImportResult _tmp13_; + ImportResult _tmp14_; BatchImportJob* job = NULL; - FileToPrepare* _tmp26_ = NULL; - BatchImportJob* _tmp27_ = NULL; - BatchImportJob* _tmp28_ = NULL; + FileToPrepare* _tmp26_; + BatchImportJob* _tmp27_; + BatchImportJob* _tmp28_; GFile* file = NULL; - FileToPrepare* _tmp29_ = NULL; - GFile* _tmp30_ = NULL; - GFile* _tmp31_ = NULL; + FileToPrepare* _tmp29_; + GFile* _tmp30_; + GFile* _tmp31_; GFile* _tmp32_ = NULL; - FileToPrepare* _tmp33_ = NULL; - FileToPrepare* _tmp34_ = NULL; + FileToPrepare* _tmp33_; + FileToPrepare* _tmp34_; GFile* associated = NULL; - GFile* _tmp38_ = NULL; + GFile* _tmp38_; gboolean copy_to_library = FALSE; - FileToPrepare* _tmp39_ = NULL; - gboolean _tmp40_ = FALSE; - GFile* _tmp41_ = NULL; + FileToPrepare* _tmp39_; + gboolean _tmp40_; + GFile* _tmp41_; gboolean _tmp46_ = FALSE; - GFile* _tmp47_ = NULL; + GFile* _tmp47_; PreparedFile* prepared_file = NULL; - BatchImportJob* _tmp55_ = NULL; - GFile* _tmp56_ = NULL; - GFile* _tmp57_ = NULL; - gboolean _tmp58_ = FALSE; + BatchImportJob* _tmp55_; + GFile* _tmp56_; + GFile* _tmp57_; + gboolean _tmp58_; PreparedFile* _tmp59_ = NULL; - ImportResult _tmp60_ = 0; - ImportResult _tmp61_ = 0; + ImportResult _tmp60_; + ImportResult _tmp61_; gboolean _tmp74_ = FALSE; - GeeArrayList* _tmp75_ = NULL; - gint _tmp76_ = 0; - gint _tmp77_ = 0; -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" + GeeArrayList* _tmp75_; + gint _tmp76_; + gint _tmp77_; +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = _file_to_prepare_index; -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_index = _tmp7_ + 1; -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = _file_to_prepare_index; -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = _file_to_prepare_size; -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!(_tmp8_ < _tmp9_)) { -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 14000 "BatchImport.c" +#line 13472 "BatchImport.c" } -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = _file_to_prepare_list; -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = _file_to_prepare_index; -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = gee_list_get (_tmp10_, _tmp11_); -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" file_to_prepare = (FileToPrepare*) _tmp12_; -#line 1696 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1703 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob)); -#line 1696 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1703 "/home/jens/Source/shotwell/src/BatchImport.vala" _result_ = _tmp13_; -#line 1697 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = _result_; -#line 1697 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp14_ != IMPORT_RESULT_SUCCESS) { -#line 14018 "BatchImport.c" - FileToPrepare* _tmp15_ = NULL; - BatchImportJob* _tmp16_ = NULL; - FileToPrepare* _tmp17_ = NULL; - BatchImportJob* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - FileToPrepare* _tmp21_ = NULL; - BatchImportJob* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - ImportResult _tmp25_ = 0; -#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 13490 "BatchImport.c" + FileToPrepare* _tmp15_; + BatchImportJob* _tmp16_; + FileToPrepare* _tmp17_; + BatchImportJob* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; + FileToPrepare* _tmp21_; + BatchImportJob* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + ImportResult _tmp25_; +#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp15_ = file_to_prepare; -#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp16_ = _tmp15_->job; -#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp17_ = file_to_prepare; -#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp18_ = _tmp17_->job; -#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp19_ = batch_import_job_get_dest_identifier (_tmp18_); -#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp20_ = _tmp19_; -#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp21_ = file_to_prepare; -#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp22_ = _tmp21_->job; -#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp23_ = batch_import_job_get_source_identifier (_tmp22_); -#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp24_ = _tmp23_; -#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp25_ = _result_; -#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp16_, NULL, _tmp20_, _tmp24_, _tmp25_); -#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp24_); -#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp20_); -#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1708 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (file_to_prepare); -#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1708 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 14062 "BatchImport.c" +#line 13534 "BatchImport.c" } -#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp26_ = file_to_prepare; -#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp27_ = _tmp26_->job; -#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp28_ = _batch_import_job_ref0 (_tmp27_); -#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala" job = _tmp28_; -#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp29_ = file_to_prepare; -#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp30_ = _tmp29_->file; -#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp31_ = _g_object_ref0 (_tmp30_); -#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala" file = _tmp31_; -#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp33_ = file_to_prepare; -#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp34_ = _tmp33_->associated; -#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp34_ != NULL) { -#line 14086 "BatchImport.c" - FileToPrepare* _tmp35_ = NULL; - FileToPrepare* _tmp36_ = NULL; - GFile* _tmp37_ = NULL; -#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 13558 "BatchImport.c" + FileToPrepare* _tmp35_; + FileToPrepare* _tmp36_; + GFile* _tmp37_; +#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp35_ = file_to_prepare; -#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp36_ = _tmp35_->associated; -#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp37_ = _tmp36_->file; -#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp32_ = _tmp37_; -#line 14098 "BatchImport.c" +#line 13570 "BatchImport.c" } else { -#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp32_ = NULL; -#line 14102 "BatchImport.c" +#line 13574 "BatchImport.c" } -#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp38_ = _g_object_ref0 (_tmp32_); -#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala" associated = _tmp38_; -#line 1707 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1714 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp39_ = file_to_prepare; -#line 1707 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1714 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp40_ = _tmp39_->copy_to_library; -#line 1707 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1714 "/home/jens/Source/shotwell/src/BatchImport.vala" copy_to_library = _tmp40_; -#line 1710 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1717 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp41_ = file; -#line 1710 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1717 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp41_ == NULL) { -#line 14118 "BatchImport.c" - BatchImportJob* _tmp42_ = NULL; +#line 13590 "BatchImport.c" + BatchImportJob* _tmp42_; GFile* _tmp43_ = NULL; gboolean _tmp44_ = FALSE; - gboolean _tmp45_ = FALSE; -#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala" + gboolean _tmp45_; +#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp42_ = job; -#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp45_ = prepare_files_job_create_file (self, _tmp42_, &_tmp43_, &_tmp44_); -#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (file); -#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala" file = _tmp43_; -#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala" copy_to_library = _tmp44_; -#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!_tmp45_) { -#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (associated); -#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (file); -#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (job); -#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (file_to_prepare); -#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala" continue; -#line 14145 "BatchImport.c" +#line 13617 "BatchImport.c" } } -#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp47_ = associated; -#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp47_ == NULL) { -#line 14152 "BatchImport.c" - FileToPrepare* _tmp48_ = NULL; - FileToPrepare* _tmp49_ = NULL; -#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 13624 "BatchImport.c" + FileToPrepare* _tmp48_; + FileToPrepare* _tmp49_; +#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp48_ = file_to_prepare; -#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp49_ = _tmp48_->associated; -#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp46_ = _tmp49_ != NULL; -#line 14161 "BatchImport.c" +#line 13633 "BatchImport.c" } else { -#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp46_ = FALSE; -#line 14165 "BatchImport.c" +#line 13637 "BatchImport.c" } -#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp46_) { -#line 14169 "BatchImport.c" - FileToPrepare* _tmp50_ = NULL; - FileToPrepare* _tmp51_ = NULL; - BatchImportJob* _tmp52_ = NULL; +#line 13641 "BatchImport.c" + FileToPrepare* _tmp50_; + FileToPrepare* _tmp51_; + BatchImportJob* _tmp52_; GFile* _tmp53_ = NULL; gboolean _tmp54_ = FALSE; -#line 1716 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp50_ = file_to_prepare; -#line 1716 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp51_ = _tmp50_->associated; -#line 1716 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp52_ = _tmp51_->job; -#line 1716 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala" prepare_files_job_create_file (self, _tmp52_, &_tmp53_, &_tmp54_); -#line 1716 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (associated); -#line 1716 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala" associated = _tmp53_; -#line 1716 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala" copy_to_library = _tmp54_; -#line 14189 "BatchImport.c" +#line 13661 "BatchImport.c" } -#line 1720 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp55_ = job; -#line 1720 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp56_ = file; -#line 1720 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp57_ = associated; -#line 1720 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp58_ = copy_to_library; -#line 1720 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp60_ = prepare_files_job_prepare_file (self, _tmp55_, _tmp56_, _tmp57_, _tmp58_, &_tmp59_); -#line 1720 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (prepared_file); -#line 1720 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala" prepared_file = _tmp59_; -#line 1720 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala" _result_ = _tmp60_; -#line 1721 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1728 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp61_ = _result_; -#line 1721 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1728 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp61_ == IMPORT_RESULT_SUCCESS) { -#line 14211 "BatchImport.c" - gint _tmp62_ = 0; - GeeArrayList* _tmp63_ = NULL; - PreparedFile* _tmp64_ = NULL; -#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 13683 "BatchImport.c" + gint _tmp62_; + GeeArrayList* _tmp63_; + PreparedFile* _tmp64_; +#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp62_ = self->prepared_files; -#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala" self->prepared_files = _tmp62_ + 1; -#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp63_ = list; -#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp64_ = prepared_file; -#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp64_); -#line 14225 "BatchImport.c" +#line 13697 "BatchImport.c" } else { - BatchImportJob* _tmp65_ = NULL; - GFile* _tmp66_ = NULL; - BatchImportJob* _tmp67_ = NULL; - gchar* _tmp68_ = NULL; - gchar* _tmp69_ = NULL; - GFile* _tmp70_ = NULL; - gchar* _tmp71_ = NULL; - gchar* _tmp72_ = NULL; - ImportResult _tmp73_ = 0; -#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImportJob* _tmp65_; + GFile* _tmp66_; + BatchImportJob* _tmp67_; + gchar* _tmp68_; + gchar* _tmp69_; + GFile* _tmp70_; + gchar* _tmp71_; + gchar* _tmp72_; + ImportResult _tmp73_; +#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp65_ = job; -#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp66_ = file; -#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp67_ = job; -#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp68_ = batch_import_job_get_source_identifier (_tmp67_); -#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp69_ = _tmp68_; -#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp70_ = file; -#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp71_ = g_file_get_path (_tmp70_); -#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp72_ = _tmp71_; -#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp73_ = _result_; -#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala" background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp65_, _tmp66_, _tmp69_, _tmp72_, _tmp73_); -#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp72_); -#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp69_); -#line 14260 "BatchImport.c" +#line 13732 "BatchImport.c" } -#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp75_ = list; -#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp76_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp77_ = _tmp76_; -#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp77_ >= BATCH_IMPORT_REPORT_EVERY_N_PREPARED_FILES) { -#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp74_ = TRUE; -#line 14272 "BatchImport.c" +#line 13744 "BatchImport.c" } else { gboolean _tmp78_ = FALSE; - GTimer* _tmp79_ = NULL; - gdouble _tmp80_ = 0.0; -#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala" + GTimer* _tmp79_; + gdouble _tmp80_; +#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp79_ = timer; -#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp80_ = g_timer_elapsed (_tmp79_, NULL); -#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala" if ((_tmp80_ * 1000.0) > ((gdouble) BATCH_IMPORT_REPORT_PREPARED_FILES_EVERY_N_MSEC)) { -#line 14283 "BatchImport.c" - GeeArrayList* _tmp81_ = NULL; - gint _tmp82_ = 0; - gint _tmp83_ = 0; -#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 13755 "BatchImport.c" + GeeArrayList* _tmp81_; + gint _tmp82_; + gint _tmp83_; +#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp81_ = list; -#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp82_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp83_ = _tmp82_; -#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp78_ = _tmp83_ > 0; -#line 14295 "BatchImport.c" +#line 13767 "BatchImport.c" } else { -#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp78_ = FALSE; -#line 14299 "BatchImport.c" +#line 13771 "BatchImport.c" } -#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp74_ = _tmp78_; -#line 14303 "BatchImport.c" +#line 13775 "BatchImport.c" } -#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp74_) { -#line 14307 "BatchImport.c" +#line 13779 "BatchImport.c" PreparedFileCluster* cluster = NULL; - GeeArrayList* _tmp84_ = NULL; - PreparedFileCluster* _tmp85_ = NULL; - GeeArrayList* _tmp86_ = NULL; - NotificationCallback _tmp87_ = NULL; - void* _tmp87__target = NULL; - PreparedFileCluster* _tmp88_ = NULL; - GTimer* _tmp89_ = NULL; -#line 1734 "/home/jens/Source/shotwell/src/BatchImport.vala" + GeeArrayList* _tmp84_; + PreparedFileCluster* _tmp85_; + GeeArrayList* _tmp86_; + NotificationCallback _tmp87_; + void* _tmp87__target; + PreparedFileCluster* _tmp88_; + GTimer* _tmp89_; +#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp84_ = list; -#line 1734 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp85_ = prepared_file_cluster_new (_tmp84_); -#line 1734 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala" cluster = _tmp85_; -#line 1735 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp86_ = gee_array_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL); -#line 1735 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (list); -#line 1735 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala" list = _tmp86_; -#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp87_ = self->priv->notification; -#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp87__target = self->priv->notification_target; -#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp88_ = cluster; -#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala" background_job_notify (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), _tmp87_, _tmp87__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_NOTIFICATION_OBJECT, NotificationObject)); -#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp89_ = timer; -#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala" g_timer_start (_tmp89_); -#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala" _notification_object_unref0 (cluster); -#line 14342 "BatchImport.c" +#line 13814 "BatchImport.c" } -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (prepared_file); -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (associated); -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (file); -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (job); -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _file_to_prepare_unref0 (file_to_prepare); -#line 14354 "BatchImport.c" +#line 13826 "BatchImport.c" } -#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_file_to_prepare_list); -#line 14358 "BatchImport.c" +#line 13830 "BatchImport.c" } -#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp90_ = list; -#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp91_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp92_ = _tmp91_; -#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp92_ > 0) { -#line 14368 "BatchImport.c" +#line 13840 "BatchImport.c" ImportResult _result_ = 0; - ImportResult _tmp93_ = 0; - ImportResult _tmp94_ = 0; -#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala" + ImportResult _tmp93_; + ImportResult _tmp94_; +#line 1749 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp93_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob)); -#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1749 "/home/jens/Source/shotwell/src/BatchImport.vala" _result_ = _tmp93_; -#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp94_ = _result_; -#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp94_ == IMPORT_RESULT_SUCCESS) { -#line 14380 "BatchImport.c" - NotificationCallback _tmp95_ = NULL; - void* _tmp95__target = NULL; - GeeArrayList* _tmp96_ = NULL; - PreparedFileCluster* _tmp97_ = NULL; - PreparedFileCluster* _tmp98_ = NULL; -#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 13852 "BatchImport.c" + NotificationCallback _tmp95_; + void* _tmp95__target; + GeeArrayList* _tmp96_; + PreparedFileCluster* _tmp97_; + PreparedFileCluster* _tmp98_; +#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp95_ = self->priv->notification; -#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp95__target = self->priv->notification_target; -#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp96_ = list; -#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp97_ = prepared_file_cluster_new (_tmp96_); -#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp98_ = _tmp97_; -#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" background_job_notify (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), _tmp95_, _tmp95__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, TYPE_NOTIFICATION_OBJECT, NotificationObject)); -#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" _notification_object_unref0 (_tmp98_); -#line 14400 "BatchImport.c" +#line 13872 "BatchImport.c" } else { - gint _tmp99_ = 0; - GeeArrayList* _tmp100_ = NULL; - gint _tmp101_ = 0; - gint _tmp102_ = 0; - gint _tmp103_ = 0; - GeeArrayList* _tmp104_ = NULL; - gint _tmp105_ = 0; - gint _tmp106_ = 0; -#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala" + gint _tmp99_; + GeeArrayList* _tmp100_; + gint _tmp101_; + gint _tmp102_; + gint _tmp103_; + GeeArrayList* _tmp104_; + gint _tmp105_; + gint _tmp106_; +#line 1754 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp99_ = self->prepared_files; -#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1754 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp100_ = list; -#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1754 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp101_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1754 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp102_ = _tmp101_; -#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1754 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (_tmp99_ >= _tmp102_, "prepared_files >= list.size"); -#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1755 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp103_ = self->prepared_files; -#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1755 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp104_ = list; -#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1755 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp105_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1755 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp106_ = _tmp105_; -#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1755 "/home/jens/Source/shotwell/src/BatchImport.vala" self->prepared_files = _tmp103_ - _tmp106_; -#line 14430 "BatchImport.c" +#line 13902 "BatchImport.c" { GeeArrayList* _prepared_file_list = NULL; - GeeArrayList* _tmp107_ = NULL; - GeeArrayList* _tmp108_ = NULL; + GeeArrayList* _tmp107_; + GeeArrayList* _tmp108_; gint _prepared_file_size = 0; - GeeArrayList* _tmp109_ = NULL; - gint _tmp110_ = 0; - gint _tmp111_ = 0; + GeeArrayList* _tmp109_; + gint _tmp110_; + gint _tmp111_; gint _prepared_file_index = 0; -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp107_ = list; -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp108_ = _g_object_ref0 (_tmp107_); -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_list = _tmp108_; -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp109_ = _prepared_file_list; -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp110_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp111_ = _tmp110_; -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_size = _tmp111_; -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_index = -1; -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" while (TRUE) { -#line 14458 "BatchImport.c" - gint _tmp112_ = 0; - gint _tmp113_ = 0; - gint _tmp114_ = 0; +#line 13930 "BatchImport.c" + gint _tmp112_; + gint _tmp113_; + gint _tmp114_; PreparedFile* prepared_file = NULL; - GeeArrayList* _tmp115_ = NULL; - gint _tmp116_ = 0; - gpointer _tmp117_ = NULL; - PreparedFile* _tmp118_ = NULL; - BatchImportJob* _tmp119_ = NULL; - PreparedFile* _tmp120_ = NULL; - GFile* _tmp121_ = NULL; - PreparedFile* _tmp122_ = NULL; - BatchImportJob* _tmp123_ = NULL; - gchar* _tmp124_ = NULL; - gchar* _tmp125_ = NULL; - PreparedFile* _tmp126_ = NULL; - GFile* _tmp127_ = NULL; - gchar* _tmp128_ = NULL; - gchar* _tmp129_ = NULL; - ImportResult _tmp130_ = 0; -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" + GeeArrayList* _tmp115_; + gint _tmp116_; + gpointer _tmp117_; + PreparedFile* _tmp118_; + BatchImportJob* _tmp119_; + PreparedFile* _tmp120_; + GFile* _tmp121_; + PreparedFile* _tmp122_; + BatchImportJob* _tmp123_; + gchar* _tmp124_; + gchar* _tmp125_; + PreparedFile* _tmp126_; + GFile* _tmp127_; + gchar* _tmp128_; + gchar* _tmp129_; + ImportResult _tmp130_; +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp112_ = _prepared_file_index; -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_index = _tmp112_ + 1; -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp113_ = _prepared_file_index; -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp114_ = _prepared_file_size; -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!(_tmp113_ < _tmp114_)) { -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" break; -#line 14491 "BatchImport.c" +#line 13963 "BatchImport.c" } -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp115_ = _prepared_file_list; -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp116_ = _prepared_file_index; -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp117_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp116_); -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" prepared_file = (PreparedFile*) _tmp117_; -#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp118_ = prepared_file; -#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp119_ = _tmp118_->job; -#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp120_ = prepared_file; -#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp121_ = _tmp120_->file; -#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp122_ = prepared_file; -#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp123_ = _tmp122_->job; -#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp124_ = batch_import_job_get_source_identifier (_tmp123_); -#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp125_ = _tmp124_; -#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp126_ = prepared_file; -#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp127_ = _tmp126_->file; -#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp128_ = g_file_get_path (_tmp127_); -#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp129_ = _tmp128_; -#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp130_ = _result_; -#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala" background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp119_, _tmp121_, _tmp125_, _tmp129_, _tmp130_); -#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp129_); -#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp125_); -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (prepared_file); -#line 14535 "BatchImport.c" +#line 14007 "BatchImport.c" } -#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_prepared_file_list); -#line 14539 "BatchImport.c" +#line 14011 "BatchImport.c" } } } -#line 1691 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (list); -#line 1691 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_timer_destroy0 (timer); -#line 14547 "BatchImport.c" +#line 14019 "BatchImport.c" } -static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImportJob* job, GFile** file, gboolean* copy_to_library) { +static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImportJob* job, GFile* * file, gboolean* copy_to_library) { GFile* _vala_file = NULL; gboolean _vala_copy_to_library = FALSE; gboolean result = FALSE; GError * _inner_error_ = NULL; -#line 1760 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1767 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_PREPARE_FILES_JOB (self), FALSE); -#line 1760 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1767 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), FALSE); -#line 14560 "BatchImport.c" +#line 14032 "BatchImport.c" { gboolean _tmp0_ = FALSE; - BatchImportJob* _tmp1_ = NULL; + BatchImportJob* _tmp1_; GFile* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; -#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala" + gboolean _tmp4_; +#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = job; -#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = batch_import_job_prepare (_tmp1_, &_tmp2_, &_tmp3_, &_inner_error_); -#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_vala_file); -#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_file = _tmp2_; -#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_copy_to_library = _tmp3_; -#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp4_; -#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14581 "BatchImport.c" - goto __catch416_g_error; +#line 14053 "BatchImport.c" + goto __catch417_g_error; } -#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!_tmp0_) { -#line 14586 "BatchImport.c" - BatchImportJob* _tmp5_ = NULL; - BatchImportJob* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - BatchImportJob* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; -#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 14058 "BatchImport.c" + BatchImportJob* _tmp5_; + BatchImportJob* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + BatchImportJob* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; +#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = job; -#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = job; -#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = batch_import_job_get_source_identifier (_tmp6_); -#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = _tmp7_; -#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = job; -#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = batch_import_job_get_dest_identifier (_tmp9_); -#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = _tmp10_; -#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala" background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp5_, NULL, _tmp8_, _tmp11_, IMPORT_RESULT_FILE_ERROR); -#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp11_); -#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp8_); -#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala" result = FALSE; -#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala" if (file) { -#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala" *file = _vala_file; -#line 14620 "BatchImport.c" +#line 14092 "BatchImport.c" } else { -#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_vala_file); -#line 14624 "BatchImport.c" +#line 14096 "BatchImport.c" } -#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala" if (copy_to_library) { -#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala" *copy_to_library = _vala_copy_to_library; -#line 14630 "BatchImport.c" +#line 14102 "BatchImport.c" } -#line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 14634 "BatchImport.c" +#line 14106 "BatchImport.c" } } - goto __finally416; - __catch416_g_error: + goto __finally417; + __catch417_g_error: { GError* err = NULL; - BatchImportJob* _tmp12_ = NULL; - BatchImportJob* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - BatchImportJob* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - GError* _tmp19_ = NULL; -#line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImportJob* _tmp12_; + BatchImportJob* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + BatchImportJob* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + GError* _tmp19_; +#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; -#line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; -#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = job; -#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = job; -#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = batch_import_job_get_source_identifier (_tmp13_); -#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp15_ = _tmp14_; -#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp16_ = job; -#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp17_ = batch_import_job_get_dest_identifier (_tmp16_); -#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp18_ = _tmp17_; -#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp19_ = err; -#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala" background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp12_, NULL, _tmp15_, _tmp18_, _tmp19_, IMPORT_RESULT_FILE_ERROR); -#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp18_); -#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp15_); -#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala" result = FALSE; -#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala" if (file) { -#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala" *file = _vala_file; -#line 14683 "BatchImport.c" +#line 14155 "BatchImport.c" } else { -#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_vala_file); -#line 14687 "BatchImport.c" +#line 14159 "BatchImport.c" } -#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala" if (copy_to_library) { -#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala" *copy_to_library = _vala_copy_to_library; -#line 14693 "BatchImport.c" +#line 14165 "BatchImport.c" } -#line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 14697 "BatchImport.c" +#line 14169 "BatchImport.c" } - __finally416: -#line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala" + __finally417: +#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14702 "BatchImport.c" +#line 14174 "BatchImport.c" gboolean _tmp20_ = FALSE; -#line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala" g_clear_error (&_inner_error_); -#line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala" return _tmp20_; -#line 14710 "BatchImport.c" +#line 14182 "BatchImport.c" } -#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala" result = TRUE; -#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala" if (file) { -#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala" *file = _vala_file; -#line 14718 "BatchImport.c" +#line 14190 "BatchImport.c" } else { -#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_vala_file); -#line 14722 "BatchImport.c" +#line 14194 "BatchImport.c" } -#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala" if (copy_to_library) { -#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala" *copy_to_library = _vala_copy_to_library; -#line 14728 "BatchImport.c" +#line 14200 "BatchImport.c" } -#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 14732 "BatchImport.c" +#line 14204 "BatchImport.c" } -static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, BatchImportJob* job, GFile* file, GFile* associated_file, gboolean copy_to_library, PreparedFile** prepared_file) { +static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, BatchImportJob* job, GFile* file, GFile* associated_file, gboolean copy_to_library, PreparedFile* * prepared_file) { PreparedFile* _vala_prepared_file = NULL; ImportResult result = 0; gboolean is_video = FALSE; - GFile* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + GFile* _tmp0_; + gboolean _tmp1_; gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + gboolean _tmp3_; gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - gint _tmp14_ = 0; + gboolean _tmp7_; + gint _tmp10_; + gint _tmp11_; + gint _tmp14_; gchar* exif_only_md5 = NULL; gchar* thumbnail_md5 = NULL; gchar* full_md5 = NULL; PhotoFileFormat file_format = 0; - GFile* _tmp28_ = NULL; - PhotoFileFormat _tmp29_ = 0; - gboolean _tmp30_ = FALSE; + GFile* _tmp28_; + PhotoFileFormat _tmp29_; + gboolean _tmp30_; guint64 filesize = 0ULL; gboolean is_in_library_dir = FALSE; - GFile* _tmp82_ = NULL; - GFile* _tmp83_ = NULL; - gboolean _tmp84_ = FALSE; + GFile* _tmp82_; + GFile* _tmp83_; + gboolean _tmp84_; gboolean _tmp85_ = FALSE; - gboolean _tmp86_ = FALSE; - BatchImportJob* _tmp88_ = NULL; - GFile* _tmp89_ = NULL; - GFile* _tmp90_ = NULL; - BatchImportJob* _tmp91_ = NULL; - gchar* _tmp92_ = NULL; - gchar* _tmp93_ = NULL; - BatchImportJob* _tmp94_ = NULL; - gchar* _tmp95_ = NULL; - gchar* _tmp96_ = NULL; - const gchar* _tmp97_ = NULL; - const gchar* _tmp98_ = NULL; - const gchar* _tmp99_ = NULL; - PhotoFileFormat _tmp100_ = 0; - guint64 _tmp101_ = 0ULL; - gboolean _tmp102_ = FALSE; - PreparedFile* _tmp103_ = NULL; + gboolean _tmp86_; + BatchImportJob* _tmp88_; + GFile* _tmp89_; + GFile* _tmp90_; + BatchImportJob* _tmp91_; + gchar* _tmp92_; + gchar* _tmp93_; + BatchImportJob* _tmp94_; + gchar* _tmp95_; + gchar* _tmp96_; + const gchar* _tmp97_; + const gchar* _tmp98_; + const gchar* _tmp99_; + PhotoFileFormat _tmp100_; + guint64 _tmp101_; + gboolean _tmp102_; + PreparedFile* _tmp103_; GError * _inner_error_ = NULL; -#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_PREPARE_FILES_JOB (self), 0); -#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), 0); -#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_IS_FILE (file), 0); -#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail ((associated_file == NULL) || G_IS_FILE (associated_file), 0); -#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); -#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_prepared_file = NULL; -#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = file; -#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = video_reader_is_supported_video_file (_tmp0_); -#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala" is_video = _tmp1_; -#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = is_video; -#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!_tmp3_) { -#line 14802 "BatchImport.c" - GFile* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; -#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 14274 "BatchImport.c" + GFile* _tmp4_; + gboolean _tmp5_; +#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = file; -#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = photo_is_file_image (_tmp4_); -#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = !_tmp5_; -#line 14811 "BatchImport.c" +#line 14283 "BatchImport.c" } else { -#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = FALSE; -#line 14815 "BatchImport.c" +#line 14287 "BatchImport.c" } -#line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp2_) { -#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1791 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_NOT_AN_IMAGE; -#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1791 "/home/jens/Source/shotwell/src/BatchImport.vala" if (prepared_file) { -#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1791 "/home/jens/Source/shotwell/src/BatchImport.vala" *prepared_file = _vala_prepared_file; -#line 14825 "BatchImport.c" +#line 14297 "BatchImport.c" } else { -#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1791 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); -#line 14829 "BatchImport.c" +#line 14301 "BatchImport.c" } -#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1791 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 14833 "BatchImport.c" +#line 14305 "BatchImport.c" } -#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = is_video; -#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!_tmp7_) { -#line 14839 "BatchImport.c" - GFile* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; -#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 14311 "BatchImport.c" + GFile* _tmp8_; + gboolean _tmp9_; +#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = file; -#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = photo_file_format_is_file_supported (_tmp8_); -#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = !_tmp9_; -#line 14848 "BatchImport.c" +#line 14320 "BatchImport.c" } else { -#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = FALSE; -#line 14852 "BatchImport.c" +#line 14324 "BatchImport.c" } -#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp6_) { -#line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_UNSUPPORTED_FORMAT; -#line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala" if (prepared_file) { -#line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala" *prepared_file = _vala_prepared_file; -#line 14862 "BatchImport.c" +#line 14334 "BatchImport.c" } else { -#line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); -#line 14866 "BatchImport.c" +#line 14338 "BatchImport.c" } -#line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 14870 "BatchImport.c" +#line 14342 "BatchImport.c" } -#line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = self->priv->import_file_count; -#line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->import_file_count = _tmp10_ + 1; -#line 1792 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = self->priv->fail_every; -#line 1792 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp11_ > 0) { -#line 14880 "BatchImport.c" - gint _tmp12_ = 0; - gint _tmp13_ = 0; -#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 14352 "BatchImport.c" + gint _tmp12_; + gint _tmp13_; +#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = self->priv->import_file_count; -#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = self->priv->fail_every; -#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala" if ((_tmp12_ % _tmp13_) == 0) { -#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_FILE_ERROR; -#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala" if (prepared_file) { -#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala" *prepared_file = _vala_prepared_file; -#line 14895 "BatchImport.c" +#line 14367 "BatchImport.c" } else { -#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); -#line 14899 "BatchImport.c" +#line 14371 "BatchImport.c" } -#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 14903 "BatchImport.c" +#line 14375 "BatchImport.c" } } -#line 1798 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1805 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = self->priv->skip_every; -#line 1798 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1805 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp14_ > 0) { -#line 14910 "BatchImport.c" - gint _tmp15_ = 0; - gint _tmp16_ = 0; -#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 14382 "BatchImport.c" + gint _tmp15_; + gint _tmp16_; +#line 1806 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp15_ = self->priv->import_file_count; -#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1806 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp16_ = self->priv->skip_every; -#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1806 "/home/jens/Source/shotwell/src/BatchImport.vala" if ((_tmp15_ % _tmp16_) == 0) { -#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_NOT_A_FILE; -#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala" if (prepared_file) { -#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala" *prepared_file = _vala_prepared_file; -#line 14925 "BatchImport.c" +#line 14397 "BatchImport.c" } else { -#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); -#line 14929 "BatchImport.c" +#line 14401 "BatchImport.c" } -#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 14933 "BatchImport.c" +#line 14405 "BatchImport.c" } } -#line 1803 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala" exif_only_md5 = NULL; -#line 1804 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1811 "/home/jens/Source/shotwell/src/BatchImport.vala" thumbnail_md5 = NULL; -#line 1805 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1812 "/home/jens/Source/shotwell/src/BatchImport.vala" full_md5 = NULL; -#line 14942 "BatchImport.c" +#line 14414 "BatchImport.c" { gchar* _tmp17_ = NULL; - GFile* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; -#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; +#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp18_ = file; -#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp19_ = md5_file (_tmp18_, &_inner_error_); -#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp17_ = _tmp19_; -#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14956 "BatchImport.c" - goto __catch417_g_error; +#line 14428 "BatchImport.c" + goto __catch418_g_error; } -#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp20_ = _tmp17_; -#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp17_ = NULL; -#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (full_md5); -#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala" full_md5 = _tmp20_; -#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp17_); -#line 14969 "BatchImport.c" +#line 14441 "BatchImport.c" } - goto __finally417; - __catch417_g_error: + goto __finally418; + __catch418_g_error: { GError* err = NULL; - GFile* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - GError* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; - GError* _tmp26_ = NULL; - ImportResult _tmp27_ = 0; -#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + GError* _tmp24_; + const gchar* _tmp25_; + GError* _tmp26_; + ImportResult _tmp27_; +#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; -#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; -#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp21_ = file; -#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp22_ = g_file_get_path (_tmp21_); -#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp23_ = _tmp22_; -#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp24_ = err; -#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp25_ = _tmp24_->message; -#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_warning ("BatchImport.vala:1813: Unable to perform MD5 checksum on file %s: %s", _tmp23_, _tmp25_); -#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala" + g_warning ("BatchImport.vala:1820: Unable to perform MD5 checksum on file %s: %s", _tmp23_, _tmp25_); +#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp23_); -#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp26_ = err; -#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp27_ = import_result_convert_error (_tmp26_, IMPORT_RESULT_FILE_ERROR); -#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp27_; -#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (full_md5); -#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (thumbnail_md5); -#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (exif_only_md5); -#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala" if (prepared_file) { -#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala" *prepared_file = _vala_prepared_file; -#line 15018 "BatchImport.c" +#line 14490 "BatchImport.c" } else { -#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); -#line 15022 "BatchImport.c" +#line 14494 "BatchImport.c" } -#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 15026 "BatchImport.c" +#line 14498 "BatchImport.c" } - __finally417: -#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala" + __finally418: +#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (full_md5); -#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (thumbnail_md5); -#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (exif_only_md5); -#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala" g_clear_error (&_inner_error_); -#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala" return 0; -#line 15043 "BatchImport.c" +#line 14515 "BatchImport.c" } -#line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp28_ = file; -#line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp29_ = photo_file_format_get_by_file_extension (_tmp28_); -#line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala" file_format = _tmp29_; -#line 1822 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1829 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp30_ = is_video; -#line 1822 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1829 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!_tmp30_) { -#line 15055 "BatchImport.c" - PhotoFileFormat _tmp31_ = 0; +#line 14527 "BatchImport.c" + PhotoFileFormat _tmp31_; PhotoFileReader* reader = NULL; - PhotoFileFormat _tmp35_ = 0; - GFile* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; - PhotoFileReader* _tmp39_ = NULL; - PhotoFileReader* _tmp40_ = NULL; + PhotoFileFormat _tmp35_; + GFile* _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; + PhotoFileReader* _tmp39_; + PhotoFileReader* _tmp40_; PhotoMetadata* metadata = NULL; - PhotoMetadata* _tmp50_ = NULL; -#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala" + PhotoMetadata* _tmp50_; +#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp31_ = file_format; -#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp31_ == PHOTO_FILE_FORMAT_UNKNOWN) { -#line 15070 "BatchImport.c" - GFile* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; -#line 1824 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 14542 "BatchImport.c" + GFile* _tmp32_; + gchar* _tmp33_; + gchar* _tmp34_; +#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp32_ = file; -#line 1824 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp33_ = g_file_get_path (_tmp32_); -#line 1824 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp34_ = _tmp33_; -#line 1824 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_warning ("BatchImport.vala:1824: Skipping %s: unrecognized file extension", _tmp34_); -#line 1824 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala" + g_warning ("BatchImport.vala:1831: Skipping %s: unrecognized file extension", _tmp34_); +#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp34_); -#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_UNSUPPORTED_FORMAT; -#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (full_md5); -#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (thumbnail_md5); -#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (exif_only_md5); -#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala" if (prepared_file) { -#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala" *prepared_file = _vala_prepared_file; -#line 15096 "BatchImport.c" +#line 14568 "BatchImport.c" } else { -#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); -#line 15100 "BatchImport.c" +#line 14572 "BatchImport.c" } -#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 15104 "BatchImport.c" +#line 14576 "BatchImport.c" } -#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp35_ = file_format; -#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp36_ = file; -#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp37_ = g_file_get_path (_tmp36_); -#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp38_ = _tmp37_; -#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp39_ = photo_file_format_create_reader (_tmp35_, _tmp38_); -#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp40_ = _tmp39_; -#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp38_); -#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala" reader = _tmp40_; -#line 1829 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1836 "/home/jens/Source/shotwell/src/BatchImport.vala" metadata = NULL; -#line 15124 "BatchImport.c" +#line 14596 "BatchImport.c" { PhotoMetadata* _tmp41_ = NULL; - PhotoFileReader* _tmp42_ = NULL; - PhotoMetadata* _tmp43_ = NULL; - PhotoMetadata* _tmp44_ = NULL; -#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala" + PhotoFileReader* _tmp42_; + PhotoMetadata* _tmp43_; + PhotoMetadata* _tmp44_; +#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp42_ = reader; -#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp43_ = photo_file_reader_read_metadata (_tmp42_, &_inner_error_); -#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp41_ = _tmp43_; -#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 15138 "BatchImport.c" - goto __catch418_g_error; +#line 14610 "BatchImport.c" + goto __catch419_g_error; } -#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp44_ = _tmp41_; -#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp41_ = NULL; -#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala" _media_metadata_unref0 (metadata); -#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala" metadata = _tmp44_; -#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala" _media_metadata_unref0 (_tmp41_); -#line 15151 "BatchImport.c" +#line 14623 "BatchImport.c" } - goto __finally418; - __catch418_g_error: + goto __finally419; + __catch419_g_error: { GError* err = NULL; - GFile* _tmp45_ = NULL; - gchar* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; - GError* _tmp48_ = NULL; - const gchar* _tmp49_ = NULL; -#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp45_; + gchar* _tmp46_; + gchar* _tmp47_; + GError* _tmp48_; + const gchar* _tmp49_; +#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; -#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; -#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp45_ = file; -#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp46_ = g_file_get_path (_tmp45_); -#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp47_ = _tmp46_; -#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp48_ = err; -#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp49_ = _tmp48_->message; -#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_warning ("BatchImport.vala:1833: Unable to read metadata for %s (%s): continuing" \ +#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" + g_warning ("BatchImport.vala:1840: Unable to read metadata for %s (%s): continuing" \ " to attempt import", _tmp47_, _tmp49_); -#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp47_); -#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 15182 "BatchImport.c" +#line 14654 "BatchImport.c" } - __finally418: -#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala" + __finally419: +#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala" _media_metadata_unref0 (metadata); -#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala" _photo_file_adapter_unref0 (reader); -#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (full_md5); -#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (thumbnail_md5); -#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (exif_only_md5); -#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala" g_clear_error (&_inner_error_); -#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala" return 0; -#line 15203 "BatchImport.c" +#line 14675 "BatchImport.c" } -#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp50_ = metadata; -#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp50_ != NULL) { -#line 15209 "BatchImport.c" +#line 14681 "BatchImport.c" guint8* flattened_sans_thumbnail = NULL; - PhotoMetadata* _tmp51_ = NULL; - gint _tmp52_ = 0; - guint8* _tmp53_ = NULL; - gint flattened_sans_thumbnail_length1 = 0; - gint _flattened_sans_thumbnail_size_ = 0; + PhotoMetadata* _tmp51_; + gint _tmp52_; + guint8* _tmp53_; + gint flattened_sans_thumbnail_length1; + gint _flattened_sans_thumbnail_size_; gboolean _tmp54_ = FALSE; - guint8* _tmp55_ = NULL; - gint _tmp55__length1 = 0; + guint8* _tmp55_; + gint _tmp55__length1; guint8* flattened_thumbnail = NULL; - PhotoMetadata* _tmp60_ = NULL; - gint _tmp61_ = 0; - guint8* _tmp62_ = NULL; - gint flattened_thumbnail_length1 = 0; - gint _flattened_thumbnail_size_ = 0; + PhotoMetadata* _tmp60_; + gint _tmp61_; + guint8* _tmp62_; + gint flattened_thumbnail_length1; + gint _flattened_thumbnail_size_; gboolean _tmp63_ = FALSE; - guint8* _tmp64_ = NULL; - gint _tmp64__length1 = 0; -#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala" + guint8* _tmp64_; + gint _tmp64__length1; +#line 1845 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp51_ = metadata; -#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1845 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp53_ = photo_metadata_flatten_exif (_tmp51_, FALSE, &_tmp52_); -#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1845 "/home/jens/Source/shotwell/src/BatchImport.vala" flattened_sans_thumbnail = _tmp53_; -#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1845 "/home/jens/Source/shotwell/src/BatchImport.vala" flattened_sans_thumbnail_length1 = _tmp52_; -#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1845 "/home/jens/Source/shotwell/src/BatchImport.vala" _flattened_sans_thumbnail_size_ = flattened_sans_thumbnail_length1; -#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp55_ = flattened_sans_thumbnail; -#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp55__length1 = flattened_sans_thumbnail_length1; -#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp55_ != NULL) { -#line 15244 "BatchImport.c" - guint8* _tmp56_ = NULL; - gint _tmp56__length1 = 0; -#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 14716 "BatchImport.c" + guint8* _tmp56_; + gint _tmp56__length1; +#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp56_ = flattened_sans_thumbnail; -#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp56__length1 = flattened_sans_thumbnail_length1; -#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp54_ = _tmp56__length1 > 0; -#line 15253 "BatchImport.c" +#line 14725 "BatchImport.c" } else { -#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp54_ = FALSE; -#line 15257 "BatchImport.c" +#line 14729 "BatchImport.c" } -#line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp54_) { -#line 15261 "BatchImport.c" - guint8* _tmp57_ = NULL; - gint _tmp57__length1 = 0; - guint8* _tmp58_ = NULL; - gint _tmp58__length1 = 0; - gchar* _tmp59_ = NULL; -#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 14733 "BatchImport.c" + guint8* _tmp57_; + gint _tmp57__length1; + guint8* _tmp58_; + gint _tmp58__length1; + gchar* _tmp59_; +#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp57_ = flattened_sans_thumbnail; -#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp57__length1 = flattened_sans_thumbnail_length1; -#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp58_ = flattened_sans_thumbnail; -#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp58__length1 = flattened_sans_thumbnail_length1; -#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp59_ = md5_binary (_tmp57_, (gsize) _tmp58__length1); -#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (exif_only_md5); -#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala" exif_only_md5 = _tmp59_; -#line 15281 "BatchImport.c" +#line 14753 "BatchImport.c" } -#line 1842 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp60_ = metadata; -#line 1842 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp62_ = photo_metadata_flatten_exif_preview (_tmp60_, &_tmp61_); -#line 1842 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" flattened_thumbnail = _tmp62_; -#line 1842 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" flattened_thumbnail_length1 = _tmp61_; -#line 1842 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" _flattened_thumbnail_size_ = flattened_thumbnail_length1; -#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp64_ = flattened_thumbnail; -#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp64__length1 = flattened_thumbnail_length1; -#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp64_ != NULL) { -#line 15299 "BatchImport.c" - guint8* _tmp65_ = NULL; - gint _tmp65__length1 = 0; -#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 14771 "BatchImport.c" + guint8* _tmp65_; + gint _tmp65__length1; +#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp65_ = flattened_thumbnail; -#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp65__length1 = flattened_thumbnail_length1; -#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp63_ = _tmp65__length1 > 0; -#line 15308 "BatchImport.c" +#line 14780 "BatchImport.c" } else { -#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp63_ = FALSE; -#line 15312 "BatchImport.c" +#line 14784 "BatchImport.c" } -#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp63_) { -#line 15316 "BatchImport.c" - guint8* _tmp66_ = NULL; - gint _tmp66__length1 = 0; - guint8* _tmp67_ = NULL; - gint _tmp67__length1 = 0; - gchar* _tmp68_ = NULL; -#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 14788 "BatchImport.c" + guint8* _tmp66_; + gint _tmp66__length1; + guint8* _tmp67_; + gint _tmp67__length1; + gchar* _tmp68_; +#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp66_ = flattened_thumbnail; -#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp66__length1 = flattened_thumbnail_length1; -#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp67_ = flattened_thumbnail; -#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp67__length1 = flattened_thumbnail_length1; -#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp68_ = md5_binary (_tmp66_, (gsize) _tmp67__length1); -#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (thumbnail_md5); -#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala" thumbnail_md5 = _tmp68_; -#line 15336 "BatchImport.c" +#line 14808 "BatchImport.c" } -#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala" flattened_thumbnail = (g_free (flattened_thumbnail), NULL); -#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala" flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL); -#line 15342 "BatchImport.c" +#line 14814 "BatchImport.c" } -#line 1822 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1829 "/home/jens/Source/shotwell/src/BatchImport.vala" _media_metadata_unref0 (metadata); -#line 1822 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1829 "/home/jens/Source/shotwell/src/BatchImport.vala" _photo_file_adapter_unref0 (reader); -#line 15348 "BatchImport.c" +#line 14820 "BatchImport.c" } -#line 1848 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala" filesize = (guint64) 0; -#line 15352 "BatchImport.c" +#line 14824 "BatchImport.c" { guint64 _tmp69_ = 0ULL; - GFile* _tmp70_ = NULL; - GCancellable* _tmp71_ = NULL; - GCancellable* _tmp72_ = NULL; - guint64 _tmp73_ = 0ULL; - guint64 _tmp74_ = 0ULL; -#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp70_; + GCancellable* _tmp71_; + GCancellable* _tmp72_; + guint64 _tmp73_; + guint64 _tmp74_; +#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp70_ = file; -#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp71_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob)); -#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp72_ = _tmp71_; -#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp73_ = query_total_file_size (_tmp70_, _tmp72_, &_inner_error_); -#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp74_ = _tmp73_; -#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp72_); -#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp69_ = _tmp74_; -#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 15376 "BatchImport.c" - goto __catch419_g_error; +#line 14848 "BatchImport.c" + goto __catch420_g_error; } -#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala" filesize = _tmp69_; -#line 15381 "BatchImport.c" +#line 14853 "BatchImport.c" } - goto __finally419; - __catch419_g_error: + goto __finally420; + __catch420_g_error: { GError* err = NULL; - GFile* _tmp75_ = NULL; - gchar* _tmp76_ = NULL; - gchar* _tmp77_ = NULL; - GError* _tmp78_ = NULL; - const gchar* _tmp79_ = NULL; - GError* _tmp80_ = NULL; - ImportResult _tmp81_ = 0; -#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp75_; + gchar* _tmp76_; + gchar* _tmp77_; + GError* _tmp78_; + const gchar* _tmp79_; + GError* _tmp80_; + ImportResult _tmp81_; +#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; -#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; -#line 1852 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp75_ = file; -#line 1852 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp76_ = g_file_get_path (_tmp75_); -#line 1852 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp77_ = _tmp76_; -#line 1852 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp78_ = err; -#line 1852 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp79_ = _tmp78_->message; -#line 1852 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_warning ("BatchImport.vala:1852: Unable to query file size of %s: %s", _tmp77_, _tmp79_); -#line 1852 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala" + g_warning ("BatchImport.vala:1859: Unable to query file size of %s: %s", _tmp77_, _tmp79_); +#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp77_); -#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp80_ = err; -#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp81_ = import_result_convert_error (_tmp80_, IMPORT_RESULT_FILE_ERROR); -#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp81_; -#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (full_md5); -#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (thumbnail_md5); -#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (exif_only_md5); -#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" if (prepared_file) { -#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" *prepared_file = _vala_prepared_file; -#line 15430 "BatchImport.c" +#line 14902 "BatchImport.c" } else { -#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); -#line 15434 "BatchImport.c" +#line 14906 "BatchImport.c" } -#line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 15438 "BatchImport.c" +#line 14910 "BatchImport.c" } - __finally419: -#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" + __finally420: +#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (full_md5); -#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (thumbnail_md5); -#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (exif_only_md5); -#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala" g_clear_error (&_inner_error_); -#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala" return 0; -#line 15455 "BatchImport.c" +#line 14927 "BatchImport.c" } -#line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp82_ = file; -#line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp83_ = self->priv->library_dir; -#line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp84_ = g_file_has_prefix (_tmp82_, _tmp83_); -#line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala" is_in_library_dir = _tmp84_; -#line 1862 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp86_ = copy_to_library; -#line 1862 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp86_) { -#line 15469 "BatchImport.c" - gboolean _tmp87_ = FALSE; -#line 1862 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 14941 "BatchImport.c" + gboolean _tmp87_; +#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp87_ = is_in_library_dir; -#line 1862 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp85_ = !_tmp87_; -#line 15475 "BatchImport.c" +#line 14947 "BatchImport.c" } else { -#line 1862 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp85_ = FALSE; -#line 15479 "BatchImport.c" +#line 14951 "BatchImport.c" } -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp88_ = job; -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp89_ = file; -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp90_ = associated_file; -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp91_ = job; -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp92_ = batch_import_job_get_source_identifier (_tmp91_); -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp93_ = _tmp92_; -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp94_ = job; -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp95_ = batch_import_job_get_dest_identifier (_tmp94_); -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp96_ = _tmp95_; -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp97_ = exif_only_md5; -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp98_ = thumbnail_md5; -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp99_ = full_md5; -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp100_ = file_format; -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp101_ = filesize; -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp102_ = is_video; -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp103_ = prepared_file_new (_tmp88_, _tmp89_, _tmp90_, _tmp93_, _tmp96_, _tmp85_, _tmp97_, _tmp98_, _tmp99_, _tmp100_, _tmp101_, _tmp102_); -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_prepared_file = _tmp103_; -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp96_); -#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp93_); -#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala" result = IMPORT_RESULT_SUCCESS; -#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (full_md5); -#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (thumbnail_md5); -#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (exif_only_md5); -#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala" if (prepared_file) { -#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala" *prepared_file = _vala_prepared_file; -#line 15533 "BatchImport.c" +#line 15005 "BatchImport.c" } else { -#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (_vala_prepared_file); -#line 15537 "BatchImport.c" +#line 15009 "BatchImport.c" } -#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 15541 "BatchImport.c" +#line 15013 "BatchImport.c" } static void prepare_files_job_class_init (PrepareFilesJobClass * klass) { -#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala" prepare_files_job_parent_class = g_type_class_peek_parent (klass); -#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala" ((BackgroundJobClass *) klass)->finalize = prepare_files_job_finalize; -#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_class_add_private (klass, sizeof (PrepareFilesJobPrivate)); -#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) prepare_files_job_real_execute; -#line 15554 "BatchImport.c" +#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala" + ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) prepare_files_job_real_execute; +#line 15026 "BatchImport.c" } static void prepare_files_job_instance_init (PrepareFilesJob * self) { -#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv = PREPARE_FILES_JOB_GET_PRIVATE (self); -#line 1660 "/home/jens/Source/shotwell/src/BatchImport.vala" - self->prepared_files = 0; #line 1667 "/home/jens/Source/shotwell/src/BatchImport.vala" + self->prepared_files = 0; +#line 1674 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->import_file_count = 0; -#line 1668 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1675 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->fail_every = 0; -#line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1676 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->skip_every = 0; -#line 15569 "BatchImport.c" +#line 15041 "BatchImport.c" } -static void prepare_files_job_finalize (BackgroundJob* obj) { +static void prepare_files_job_finalize (BackgroundJob * obj) { PrepareFilesJob * self; -#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARE_FILES_JOB, PrepareFilesJob); -#line 1662 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->files_to_prepare); -#line 1664 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->library_dir); -#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala" BACKGROUND_JOB_CLASS (prepare_files_job_parent_class)->finalize (obj); -#line 15583 "BatchImport.c" +#line 15055 "BatchImport.c" } @@ -15604,596 +15076,596 @@ GType prepare_files_job_get_type (void) { static gpointer _prepared_file_ref0 (gpointer self) { -#line 1886 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1893 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? prepared_file_ref (self) : NULL; -#line 15602 "BatchImport.c" +#line 15074 "BatchImport.c" } static gpointer _batch_import_result_ref0 (gpointer self) { -#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1894 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? batch_import_result_ref (self) : NULL; -#line 15609 "BatchImport.c" +#line 15081 "BatchImport.c" } static gpointer _video_import_params_ref0 (gpointer self) { -#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? video_import_params_ref (self) : NULL; -#line 15616 "BatchImport.c" +#line 15088 "BatchImport.c" } static gpointer _photo_import_params_ref0 (gpointer self) { -#line 1889 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? photo_import_params_ref (self) : NULL; -#line 15623 "BatchImport.c" +#line 15095 "BatchImport.c" } ReadyForImport* ready_for_import_construct (GType object_type, GFile* final_file, PreparedFile* prepared_file, PhotoImportParams* photo_import_params, VideoImportParams* video_import_params, BatchImportResult* batch_result) { ReadyForImport* self = NULL; - PreparedFile* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - GFile* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - PreparedFile* _tmp10_ = NULL; - PreparedFile* _tmp11_ = NULL; - BatchImportResult* _tmp12_ = NULL; - BatchImportResult* _tmp13_ = NULL; - VideoImportParams* _tmp14_ = NULL; - VideoImportParams* _tmp15_ = NULL; - PhotoImportParams* _tmp16_ = NULL; - PhotoImportParams* _tmp17_ = NULL; - PreparedFile* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; -#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala" + PreparedFile* _tmp0_; + gboolean _tmp1_; + GFile* _tmp8_; + GFile* _tmp9_; + PreparedFile* _tmp10_; + PreparedFile* _tmp11_; + BatchImportResult* _tmp12_; + BatchImportResult* _tmp13_; + VideoImportParams* _tmp14_; + VideoImportParams* _tmp15_; + PhotoImportParams* _tmp16_; + PhotoImportParams* _tmp17_; + PreparedFile* _tmp18_; + gboolean _tmp19_; +#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_IS_FILE (final_file), NULL); -#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_PREPARED_FILE (prepared_file), NULL); -#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail ((photo_import_params == NULL) || IS_PHOTO_IMPORT_PARAMS (photo_import_params), NULL); -#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail ((video_import_params == NULL) || IS_VIDEO_IMPORT_PARAMS (video_import_params), NULL); -#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_RESULT (batch_result), NULL); -#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (ReadyForImport*) g_type_create_instance (object_type); -#line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = prepared_file; -#line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = _tmp0_->is_video; -#line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp1_) { -#line 15661 "BatchImport.c" +#line 15133 "BatchImport.c" gboolean _tmp2_ = FALSE; - VideoImportParams* _tmp3_ = NULL; -#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala" + VideoImportParams* _tmp3_; +#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = video_import_params; -#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp3_ != NULL) { -#line 15668 "BatchImport.c" - PhotoImportParams* _tmp4_ = NULL; -#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 15140 "BatchImport.c" + PhotoImportParams* _tmp4_; +#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = photo_import_params; -#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = _tmp4_ == NULL; -#line 15674 "BatchImport.c" +#line 15146 "BatchImport.c" } else { -#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = FALSE; -#line 15678 "BatchImport.c" +#line 15150 "BatchImport.c" } -#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (_tmp2_, "(video_import_params != null) && (photo_import_params == null)"); -#line 15682 "BatchImport.c" +#line 15154 "BatchImport.c" } else { gboolean _tmp5_ = FALSE; - VideoImportParams* _tmp6_ = NULL; -#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" + VideoImportParams* _tmp6_; +#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = video_import_params; -#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp6_ == NULL) { -#line 15690 "BatchImport.c" - PhotoImportParams* _tmp7_ = NULL; -#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 15162 "BatchImport.c" + PhotoImportParams* _tmp7_; +#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = photo_import_params; -#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = _tmp7_ != NULL; -#line 15696 "BatchImport.c" +#line 15168 "BatchImport.c" } else { -#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = FALSE; -#line 15700 "BatchImport.c" +#line 15172 "BatchImport.c" } -#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (_tmp5_, "(video_import_params == null) && (photo_import_params != null)"); -#line 15704 "BatchImport.c" +#line 15176 "BatchImport.c" } -#line 1885 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1892 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = final_file; -#line 1885 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1892 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = _g_object_ref0 (_tmp8_); -#line 1885 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1892 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->final_file); -#line 1885 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1892 "/home/jens/Source/shotwell/src/BatchImport.vala" self->final_file = _tmp9_; -#line 1886 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1893 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = prepared_file; -#line 1886 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1893 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = _prepared_file_ref0 (_tmp10_); -#line 1886 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1893 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (self->prepared_file); -#line 1886 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1893 "/home/jens/Source/shotwell/src/BatchImport.vala" self->prepared_file = _tmp11_; -#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1894 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = batch_result; -#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1894 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = _batch_import_result_ref0 (_tmp12_); -#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1894 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (self->batch_result); -#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1894 "/home/jens/Source/shotwell/src/BatchImport.vala" self->batch_result = _tmp13_; -#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = video_import_params; -#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp15_ = _video_import_params_ref0 (_tmp14_); -#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala" _video_import_params_unref0 (self->video_import_params); -#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala" self->video_import_params = _tmp15_; -#line 1889 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp16_ = photo_import_params; -#line 1889 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp17_ = _photo_import_params_ref0 (_tmp16_); -#line 1889 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala" _photo_import_params_unref0 (self->photo_import_params); -#line 1889 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala" self->photo_import_params = _tmp17_; -#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp18_ = prepared_file; -#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp19_ = _tmp18_->is_video; -#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala" self->is_video = _tmp19_; -#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 15754 "BatchImport.c" +#line 15226 "BatchImport.c" } ReadyForImport* ready_for_import_new (GFile* final_file, PreparedFile* prepared_file, PhotoImportParams* photo_import_params, VideoImportParams* video_import_params, BatchImportResult* batch_result) { -#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala" return ready_for_import_construct (TYPE_READY_FOR_IMPORT, final_file, prepared_file, photo_import_params, video_import_params, batch_result); -#line 15761 "BatchImport.c" +#line 15233 "BatchImport.c" } BatchImportResult* ready_for_import_abort (ReadyForImport* self) { BatchImportResult* result = NULL; gboolean _tmp0_ = FALSE; - GFile* _tmp1_ = NULL; - PreparedFile* _tmp14_ = NULL; - BatchImportJob* _tmp15_ = NULL; - PreparedFile* _tmp16_ = NULL; - GFile* _tmp17_ = NULL; - PreparedFile* _tmp18_ = NULL; - BatchImportJob* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - PreparedFile* _tmp22_ = NULL; - BatchImportJob* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - BatchImportResult* _tmp26_ = NULL; - BatchImportResult* _tmp27_ = NULL; - BatchImportResult* _tmp28_ = NULL; + GFile* _tmp1_; + PreparedFile* _tmp14_; + BatchImportJob* _tmp15_; + PreparedFile* _tmp16_; + GFile* _tmp17_; + PreparedFile* _tmp18_; + BatchImportJob* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; + PreparedFile* _tmp22_; + BatchImportJob* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + BatchImportResult* _tmp26_; + BatchImportResult* _tmp27_; + BatchImportResult* _tmp28_; GError * _inner_error_ = NULL; -#line 1893 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1900 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_READY_FOR_IMPORT (self), NULL); -#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = self->final_file; -#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp1_ != NULL) { -#line 15791 "BatchImport.c" - GFile* _tmp2_ = NULL; - PreparedFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; -#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 15263 "BatchImport.c" + GFile* _tmp2_; + PreparedFile* _tmp3_; + GFile* _tmp4_; +#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = self->final_file; -#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = self->prepared_file; -#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = _tmp3_->file; -#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp2_ != _tmp4_; -#line 15803 "BatchImport.c" +#line 15275 "BatchImport.c" } else { -#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = FALSE; -#line 15807 "BatchImport.c" +#line 15279 "BatchImport.c" } -#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp0_) { -#line 15811 "BatchImport.c" - GFile* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; -#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 15283 "BatchImport.c" + GFile* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; +#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = self->final_file; -#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = g_file_get_path (_tmp5_); -#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = _tmp6_; -#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_debug ("BatchImport.vala:1896: Deleting aborted import copy %s", _tmp7_); -#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala" + g_debug ("BatchImport.vala:1903: Deleting aborted import copy %s", _tmp7_); +#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp7_); -#line 15825 "BatchImport.c" +#line 15297 "BatchImport.c" { - GFile* _tmp8_ = NULL; -#line 1898 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp8_; +#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = self->final_file; -#line 1898 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" g_file_delete (_tmp8_, NULL, &_inner_error_); -#line 1898 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 15834 "BatchImport.c" - goto __catch420_g_error; +#line 15306 "BatchImport.c" + goto __catch421_g_error; } } - goto __finally420; - __catch420_g_error: + goto __finally421; + __catch421_g_error: { GError* err = NULL; - GFile* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - GError* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; -#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + GError* _tmp12_; + const gchar* _tmp13_; +#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; -#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; -#line 1900 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = self->final_file; -#line 1900 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = g_file_get_path (_tmp9_); -#line 1900 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = _tmp10_; -#line 1900 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = err; -#line 1900 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = _tmp12_->message; -#line 1900 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_warning ("BatchImport.vala:1900: Unable to delete copy of imported file (aborted" \ +#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala" + g_warning ("BatchImport.vala:1907: Unable to delete copy of imported file (aborted" \ " import) %s: %s", _tmp11_, _tmp13_); -#line 1900 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp11_); -#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 15867 "BatchImport.c" +#line 15339 "BatchImport.c" } - __finally420: -#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala" + __finally421: +#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala" g_clear_error (&_inner_error_); -#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 15878 "BatchImport.c" +#line 15350 "BatchImport.c" } } -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = self->prepared_file; -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp15_ = _tmp14_->job; -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp16_ = self->prepared_file; -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp17_ = _tmp16_->file; -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp18_ = self->prepared_file; -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp19_ = _tmp18_->job; -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp20_ = batch_import_job_get_source_identifier (_tmp19_); -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp21_ = _tmp20_; -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp22_ = self->prepared_file; -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp23_ = _tmp22_->job; -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp24_ = batch_import_job_get_dest_identifier (_tmp23_); -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp25_ = _tmp24_; -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp26_ = batch_import_result_new (_tmp15_, _tmp17_, _tmp21_, _tmp25_, NULL, IMPORT_RESULT_USER_ABORT); -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (self->batch_result); -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" self->batch_result = _tmp26_; -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp25_); -#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp21_); -#line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1916 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp27_ = self->batch_result; -#line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1916 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp28_ = _batch_import_result_ref0 (_tmp27_); -#line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1916 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp28_; -#line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1916 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 15923 "BatchImport.c" +#line 15395 "BatchImport.c" } static gpointer _thumbnails_ref0 (gpointer self) { -#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala" return self ? thumbnails_ref (self) : NULL; -#line 15930 "BatchImport.c" +#line 15402 "BatchImport.c" } Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) { Thumbnails* result = NULL; Thumbnails* _tmp0_ = NULL; - PhotoImportParams* _tmp1_ = NULL; - Thumbnails* _tmp6_ = NULL; -#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala" + PhotoImportParams* _tmp1_; + Thumbnails* _tmp6_; +#line 1919 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_READY_FOR_IMPORT (self), NULL); -#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = self->photo_import_params; -#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp1_ != NULL) { -#line 15945 "BatchImport.c" - PhotoImportParams* _tmp2_ = NULL; - Thumbnails* _tmp3_ = NULL; -#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 15417 "BatchImport.c" + PhotoImportParams* _tmp2_; + Thumbnails* _tmp3_; +#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = self->photo_import_params; -#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = _tmp2_->thumbnails; -#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp3_; -#line 15954 "BatchImport.c" +#line 15426 "BatchImport.c" } else { - VideoImportParams* _tmp4_ = NULL; - Thumbnails* _tmp5_ = NULL; -#line 1914 "/home/jens/Source/shotwell/src/BatchImport.vala" + VideoImportParams* _tmp4_; + Thumbnails* _tmp5_; +#line 1921 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = self->video_import_params; -#line 1914 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1921 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = _tmp4_->thumbnails; -#line 1914 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1921 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = _tmp5_; -#line 15964 "BatchImport.c" +#line 15436 "BatchImport.c" } -#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = _thumbnails_ref0 (_tmp0_); -#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala" result = _tmp6_; -#line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala" return result; -#line 15972 "BatchImport.c" +#line 15444 "BatchImport.c" } static void value_ready_for_import_init (GValue* value) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 15979 "BatchImport.c" +#line 15451 "BatchImport.c" } static void value_ready_for_import_free_value (GValue* value) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" if (value->data[0].v_pointer) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" ready_for_import_unref (value->data[0].v_pointer); -#line 15988 "BatchImport.c" +#line 15460 "BatchImport.c" } } static void value_ready_for_import_copy_value (const GValue* src_value, GValue* dest_value) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" if (src_value->data[0].v_pointer) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = ready_for_import_ref (src_value->data[0].v_pointer); -#line 15998 "BatchImport.c" +#line 15470 "BatchImport.c" } else { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = NULL; -#line 16002 "BatchImport.c" +#line 15474 "BatchImport.c" } } static gpointer value_ready_for_import_peek_pointer (const GValue* value) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 16010 "BatchImport.c" +#line 15482 "BatchImport.c" } static gchar* value_ready_for_import_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" if (collect_values[0].v_pointer) { -#line 16017 "BatchImport.c" - ReadyForImport* object; +#line 15489 "BatchImport.c" + ReadyForImport * object; object = collect_values[0].v_pointer; -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" if (object->parent_instance.g_class == NULL) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 16024 "BatchImport.c" +#line 15496 "BatchImport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 16028 "BatchImport.c" +#line 15500 "BatchImport.c" } -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = ready_for_import_ref (object); -#line 16032 "BatchImport.c" +#line 15504 "BatchImport.c" } else { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 16036 "BatchImport.c" +#line 15508 "BatchImport.c" } -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 16040 "BatchImport.c" +#line 15512 "BatchImport.c" } static gchar* value_ready_for_import_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - ReadyForImport** object_p; + ReadyForImport ** object_p; object_p = collect_values[0].v_pointer; -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!object_p) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 16051 "BatchImport.c" +#line 15523 "BatchImport.c" } -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!value->data[0].v_pointer) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = NULL; -#line 16057 "BatchImport.c" +#line 15529 "BatchImport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = value->data[0].v_pointer; -#line 16061 "BatchImport.c" +#line 15533 "BatchImport.c" } else { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = ready_for_import_ref (value->data[0].v_pointer); -#line 16065 "BatchImport.c" +#line 15537 "BatchImport.c" } -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 16069 "BatchImport.c" +#line 15541 "BatchImport.c" } GParamSpec* param_spec_ready_for_import (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { ParamSpecReadyForImport* spec; -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_READY_FOR_IMPORT), NULL); -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" return G_PARAM_SPEC (spec); -#line 16083 "BatchImport.c" +#line 15555 "BatchImport.c" } gpointer value_get_ready_for_import (const GValue* value) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_READY_FOR_IMPORT), NULL); -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 16092 "BatchImport.c" +#line 15564 "BatchImport.c" } void value_set_ready_for_import (GValue* value, gpointer v_object) { - ReadyForImport* old; -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" + ReadyForImport * old; +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_READY_FOR_IMPORT)); -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" old = value->data[0].v_pointer; -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" if (v_object) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_READY_FOR_IMPORT)); -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" ready_for_import_ref (value->data[0].v_pointer); -#line 16112 "BatchImport.c" +#line 15584 "BatchImport.c" } else { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 16116 "BatchImport.c" +#line 15588 "BatchImport.c" } -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" ready_for_import_unref (old); -#line 16122 "BatchImport.c" +#line 15594 "BatchImport.c" } } void value_take_ready_for_import (GValue* value, gpointer v_object) { - ReadyForImport* old; -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" + ReadyForImport * old; +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_READY_FOR_IMPORT)); -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" old = value->data[0].v_pointer; -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" if (v_object) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_READY_FOR_IMPORT)); -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 16141 "BatchImport.c" +#line 15613 "BatchImport.c" } else { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 16145 "BatchImport.c" +#line 15617 "BatchImport.c" } -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" ready_for_import_unref (old); -#line 16151 "BatchImport.c" +#line 15623 "BatchImport.c" } } static void ready_for_import_class_init (ReadyForImportClass * klass) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" ready_for_import_parent_class = g_type_class_peek_parent (klass); -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" ((ReadyForImportClass *) klass)->finalize = ready_for_import_finalize; -#line 16161 "BatchImport.c" +#line 15633 "BatchImport.c" } static void ready_for_import_instance_init (ReadyForImport * self) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ref_count = 1; -#line 16168 "BatchImport.c" +#line 15640 "BatchImport.c" } -static void ready_for_import_finalize (ReadyForImport* obj) { +static void ready_for_import_finalize (ReadyForImport * obj) { ReadyForImport * self; -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_READY_FOR_IMPORT, ReadyForImport); -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" g_signal_handlers_destroy (self); -#line 1870 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->final_file); -#line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1878 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (self->prepared_file); -#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1879 "/home/jens/Source/shotwell/src/BatchImport.vala" _photo_import_params_unref0 (self->photo_import_params); -#line 1873 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala" _video_import_params_unref0 (self->video_import_params); -#line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (self->batch_result); -#line 16188 "BatchImport.c" +#line 15660 "BatchImport.c" } @@ -16212,761 +15684,761 @@ GType ready_for_import_get_type (void) { gpointer ready_for_import_ref (gpointer instance) { - ReadyForImport* self; + ReadyForImport * self; self = instance; -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" g_atomic_int_inc (&self->ref_count); -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" return instance; -#line 16213 "BatchImport.c" +#line 15685 "BatchImport.c" } void ready_for_import_unref (gpointer instance) { - ReadyForImport* self; + ReadyForImport * self; self = instance; -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" READY_FOR_IMPORT_GET_CLASS (self)->finalize (self); -#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 16226 "BatchImport.c" +#line 15698 "BatchImport.c" } } PreparedFileImportJob* prepared_file_import_job_construct (GType object_type, BatchImport* owner, PreparedFile* prepared_file, ImportID* import_id, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) { PreparedFileImportJob* self = NULL; - BatchImport* _tmp0_ = NULL; - CompletionCallback _tmp1_ = NULL; - void* _tmp1__target = NULL; - GCancellable* _tmp2_ = NULL; - CancellationCallback _tmp3_ = NULL; - void* _tmp3__target = NULL; - ImportID _tmp4_ = {0}; - PreparedFile* _tmp5_ = NULL; - PreparedFile* _tmp6_ = NULL; -#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImport* _tmp0_; + CompletionCallback _tmp1_; + void* _tmp1__target; + GCancellable* _tmp2_; + CancellationCallback _tmp3_; + void* _tmp3__target; + ImportID _tmp4_; + PreparedFile* _tmp5_; + PreparedFile* _tmp6_; +#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL); -#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_PREPARED_FILE (prepared_file), NULL); -#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (import_id != NULL, NULL); -#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL); -#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = owner; -#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = callback; -#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1__target = callback_target; -#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = cancellable; -#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = cancellation; -#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3__target = cancellation_target; -#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (PreparedFileImportJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target, NULL); -#line 1929 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1936 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = *import_id; -#line 1929 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1936 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->import_id = _tmp4_; -#line 1930 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1937 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = prepared_file; -#line 1930 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1937 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = _prepared_file_ref0 (_tmp5_); -#line 1930 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1937 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (self->not_ready); -#line 1930 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1937 "/home/jens/Source/shotwell/src/BatchImport.vala" self->not_ready = _tmp6_; -#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1939 "/home/jens/Source/shotwell/src/BatchImport.vala" background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW); -#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 16280 "BatchImport.c" +#line 15752 "BatchImport.c" } PreparedFileImportJob* prepared_file_import_job_new (BatchImport* owner, PreparedFile* prepared_file, ImportID* import_id, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) { -#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala" return prepared_file_import_job_construct (TYPE_PREPARED_FILE_IMPORT_JOB, owner, prepared_file, import_id, callback, callback_target, cancellable, cancellation, cancellation_target); -#line 16287 "BatchImport.c" +#line 15759 "BatchImport.c" } static void prepared_file_import_job_real_execute (BackgroundJob* base) { PreparedFileImportJob * self; PreparedFile* prepared_file = NULL; - PreparedFile* _tmp0_ = NULL; - PreparedFile* _tmp1_ = NULL; + PreparedFile* _tmp0_; + PreparedFile* _tmp1_; GFile* final_file = NULL; - PreparedFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; + PreparedFile* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; GFile* final_associated_file = NULL; - PreparedFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; - PreparedFile* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; - GFile* _tmp51_ = NULL; - gchar* _tmp52_ = NULL; - gchar* _tmp53_ = NULL; + PreparedFile* _tmp5_; + GFile* _tmp6_; + GFile* _tmp7_; + PreparedFile* _tmp8_; + gboolean _tmp9_; + GFile* _tmp51_; + gchar* _tmp52_; + gchar* _tmp53_; ImportResult _result_ = 0; VideoImportParams* video_import_params = NULL; PhotoImportParams* photo_import_params = NULL; - PreparedFile* _tmp54_ = NULL; - gboolean _tmp55_ = FALSE; + PreparedFile* _tmp54_; + gboolean _tmp55_; gboolean _tmp82_ = FALSE; - ImportResult _tmp83_ = 0; + ImportResult _tmp83_; BatchImportResult* batch_result = NULL; - PreparedFile* _tmp96_ = NULL; - BatchImportJob* _tmp97_ = NULL; - GFile* _tmp98_ = NULL; - GFile* _tmp99_ = NULL; - gchar* _tmp100_ = NULL; - gchar* _tmp101_ = NULL; - GFile* _tmp102_ = NULL; - gchar* _tmp103_ = NULL; - gchar* _tmp104_ = NULL; - ImportResult _tmp105_ = 0; - BatchImportResult* _tmp106_ = NULL; - BatchImportResult* _tmp107_ = NULL; - BatchImportResult* _tmp108_ = NULL; - ImportResult _tmp109_ = 0; + PreparedFile* _tmp96_; + BatchImportJob* _tmp97_; + GFile* _tmp98_; + GFile* _tmp99_; + gchar* _tmp100_; + gchar* _tmp101_; + GFile* _tmp102_; + gchar* _tmp103_; + gchar* _tmp104_; + ImportResult _tmp105_; + BatchImportResult* _tmp106_; + BatchImportResult* _tmp107_; + BatchImportResult* _tmp108_; + ImportResult _tmp109_; GError * _inner_error_ = NULL; -#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob); -#line 1936 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = self->not_ready; -#line 1936 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = _prepared_file_ref0 (_tmp0_); -#line 1936 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala" prepared_file = _tmp1_; -#line 1937 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1944 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (self->not_ready); -#line 1937 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1944 "/home/jens/Source/shotwell/src/BatchImport.vala" self->not_ready = NULL; -#line 1939 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1946 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = prepared_file; -#line 1939 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1946 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = _tmp2_->file; -#line 1939 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1946 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = _g_object_ref0 (_tmp3_); -#line 1939 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1946 "/home/jens/Source/shotwell/src/BatchImport.vala" final_file = _tmp4_; -#line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = prepared_file; -#line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = _tmp5_->associated_file; -#line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = _g_object_ref0 (_tmp6_); -#line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" final_associated_file = _tmp7_; -#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = prepared_file; -#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = _tmp8_->copy_to_library; -#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp9_) { -#line 16366 "BatchImport.c" +#line 15838 "BatchImport.c" { GFile* _tmp10_ = NULL; - PreparedFile* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; - GFile* _tmp15_ = NULL; - GFile* _tmp29_ = NULL; -#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala" + PreparedFile* _tmp11_; + GFile* _tmp12_; + GFile* _tmp13_; + GFile* _tmp14_; + GFile* _tmp15_; + GFile* _tmp29_; +#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp11_ = prepared_file; -#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp12_ = _tmp11_->file; -#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp13_ = library_files_duplicate (_tmp12_, NULL, NULL, TRUE, &_inner_error_); -#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = _tmp13_; -#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16385 "BatchImport.c" - goto __catch421_g_error; +#line 15857 "BatchImport.c" + goto __catch422_g_error; } -#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = _tmp10_; -#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = NULL; -#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (final_file); -#line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala" final_file = _tmp14_; -#line 1946 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1953 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp15_ = final_file; -#line 1946 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1953 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp15_ == NULL) { -#line 16400 "BatchImport.c" - PreparedFile* _tmp16_ = NULL; - BatchImportJob* _tmp17_ = NULL; - PreparedFile* _tmp18_ = NULL; - GFile* _tmp19_ = NULL; - PreparedFile* _tmp20_ = NULL; - GFile* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - PreparedFile* _tmp24_ = NULL; - GFile* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - BatchImportResult* _tmp28_ = NULL; -#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 15872 "BatchImport.c" + PreparedFile* _tmp16_; + BatchImportJob* _tmp17_; + PreparedFile* _tmp18_; + GFile* _tmp19_; + PreparedFile* _tmp20_; + GFile* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + PreparedFile* _tmp24_; + GFile* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + BatchImportResult* _tmp28_; +#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp16_ = prepared_file; -#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp17_ = _tmp16_->job; -#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp18_ = prepared_file; -#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp19_ = _tmp18_->file; -#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp20_ = prepared_file; -#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp21_ = _tmp20_->file; -#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp22_ = g_file_get_path (_tmp21_); -#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp23_ = _tmp22_; -#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp24_ = prepared_file; -#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp25_ = _tmp24_->file; -#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp26_ = g_file_get_path (_tmp25_); -#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp27_ = _tmp26_; -#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp28_ = batch_import_result_new (_tmp17_, _tmp19_, _tmp23_, _tmp27_, NULL, IMPORT_RESULT_FILE_ERROR); -#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (self->failed); -#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala" self->failed = _tmp28_; -#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp27_); -#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp23_); -#line 1951 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1958 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp10_); -#line 1951 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1958 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (final_associated_file); -#line 1951 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1958 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (final_file); -#line 1951 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1958 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (prepared_file); -#line 1951 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1958 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 16458 "BatchImport.c" +#line 15930 "BatchImport.c" } -#line 1955 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1962 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp29_ = final_associated_file; -#line 1955 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1962 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp29_ != NULL) { -#line 16464 "BatchImport.c" +#line 15936 "BatchImport.c" GFile* _tmp30_ = NULL; - PreparedFile* _tmp31_ = NULL; - GFile* _tmp32_ = NULL; - GFile* _tmp33_ = NULL; - GFile* _tmp34_ = NULL; -#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala" + PreparedFile* _tmp31_; + GFile* _tmp32_; + GFile* _tmp33_; + GFile* _tmp34_; +#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp31_ = prepared_file; -#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp32_ = _tmp31_->associated_file; -#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp33_ = library_files_duplicate (_tmp32_, NULL, NULL, TRUE, &_inner_error_); -#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp30_ = _tmp33_; -#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp10_); -#line 16482 "BatchImport.c" - goto __catch421_g_error; +#line 15954 "BatchImport.c" + goto __catch422_g_error; } -#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp34_ = _tmp30_; -#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp30_ = NULL; -#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (final_associated_file); -#line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala" final_associated_file = _tmp34_; -#line 1955 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1962 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp30_); -#line 16495 "BatchImport.c" +#line 15967 "BatchImport.c" } -#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp10_); -#line 16499 "BatchImport.c" +#line 15971 "BatchImport.c" } - goto __finally421; - __catch421_g_error: + goto __finally422; + __catch422_g_error: { GError* err = NULL; gchar* _tmp35_ = NULL; - GFile* _tmp36_ = NULL; + GFile* _tmp36_; gchar* filename = NULL; - gchar* _tmp42_ = NULL; - PreparedFile* _tmp43_ = NULL; - BatchImportJob* _tmp44_ = NULL; - PreparedFile* _tmp45_ = NULL; - GFile* _tmp46_ = NULL; - const gchar* _tmp47_ = NULL; - const gchar* _tmp48_ = NULL; - GError* _tmp49_ = NULL; - BatchImportResult* _tmp50_ = NULL; -#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala" + gchar* _tmp42_; + PreparedFile* _tmp43_; + BatchImportJob* _tmp44_; + PreparedFile* _tmp45_; + GFile* _tmp46_; + const gchar* _tmp47_; + const gchar* _tmp48_; + GError* _tmp49_; + BatchImportResult* _tmp50_; +#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; -#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; -#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp36_ = final_file; -#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp36_ != NULL) { -#line 16525 "BatchImport.c" - GFile* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; -#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 15997 "BatchImport.c" + GFile* _tmp37_; + gchar* _tmp38_; +#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp37_ = final_file; -#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp38_ = g_file_get_path (_tmp37_); -#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp35_); -#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp35_ = _tmp38_; -#line 16536 "BatchImport.c" +#line 16008 "BatchImport.c" } else { - PreparedFile* _tmp39_ = NULL; - const gchar* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; -#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala" + PreparedFile* _tmp39_; + const gchar* _tmp40_; + gchar* _tmp41_; +#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp39_ = prepared_file; -#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp40_ = _tmp39_->source_id; -#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp41_ = g_strdup (_tmp40_); -#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp35_); -#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp35_ = _tmp41_; -#line 16551 "BatchImport.c" +#line 16023 "BatchImport.c" } -#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp42_ = g_strdup (_tmp35_); -#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala" filename = _tmp42_; -#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp43_ = prepared_file; -#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp44_ = _tmp43_->job; -#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp45_ = prepared_file; -#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp46_ = _tmp45_->file; -#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp47_ = filename; -#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp48_ = filename; -#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp49_ = err; -#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp50_ = batch_import_result_new_from_error (_tmp44_, _tmp46_, _tmp47_, _tmp48_, _tmp49_, IMPORT_RESULT_FILE_ERROR); -#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (self->failed); -#line 1960 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala" self->failed = _tmp50_; -#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (filename); -#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp35_); -#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (final_associated_file); -#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (final_file); -#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (prepared_file); -#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 16591 "BatchImport.c" +#line 16063 "BatchImport.c" } - __finally421: -#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala" + __finally422: +#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (final_associated_file); -#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (final_file); -#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (prepared_file); -#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala" g_clear_error (&_inner_error_); -#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 16608 "BatchImport.c" +#line 16080 "BatchImport.c" } } -#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1974 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp51_ = final_file; -#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1974 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp52_ = g_file_get_path (_tmp51_); -#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1974 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp53_ = _tmp52_; -#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_debug ("BatchImport.vala:1967: Importing %s", _tmp53_); -#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1974 "/home/jens/Source/shotwell/src/BatchImport.vala" + g_debug ("BatchImport.vala:1974: Importing %s", _tmp53_); +#line 1974 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp53_); -#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1976 "/home/jens/Source/shotwell/src/BatchImport.vala" _result_ = IMPORT_RESULT_SUCCESS; -#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala" video_import_params = NULL; -#line 1971 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1978 "/home/jens/Source/shotwell/src/BatchImport.vala" photo_import_params = NULL; -#line 1972 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp54_ = prepared_file; -#line 1972 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp55_ = _tmp54_->is_video; -#line 1972 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp55_) { -#line 16633 "BatchImport.c" - GFile* _tmp56_ = NULL; - ImportID _tmp57_ = {0}; - PreparedFile* _tmp58_ = NULL; - const gchar* _tmp59_ = NULL; - Thumbnails* _tmp60_ = NULL; - Thumbnails* _tmp61_ = NULL; - PreparedFile* _tmp62_ = NULL; - BatchImportJob* _tmp63_ = NULL; - time_t _tmp64_ = 0; - VideoImportParams* _tmp65_ = NULL; - VideoImportParams* _tmp66_ = NULL; - ImportResult _tmp67_ = 0; -#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 16105 "BatchImport.c" + GFile* _tmp56_; + ImportID _tmp57_; + PreparedFile* _tmp58_; + const gchar* _tmp59_; + Thumbnails* _tmp60_; + Thumbnails* _tmp61_; + PreparedFile* _tmp62_; + BatchImportJob* _tmp63_; + time_t _tmp64_; + VideoImportParams* _tmp65_; + VideoImportParams* _tmp66_; + ImportResult _tmp67_; +#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp56_ = final_file; -#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp57_ = self->priv->import_id; -#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp58_ = prepared_file; -#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp59_ = _tmp58_->full_md5; -#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp60_ = thumbnails_new (); -#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp61_ = _tmp60_; -#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp62_ = prepared_file; -#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp63_ = _tmp62_->job; -#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp64_ = batch_import_job_get_exposure_time_override (_tmp63_); -#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp65_ = video_import_params_new (_tmp56_, &_tmp57_, _tmp59_, _tmp61_, _tmp64_); -#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala" _video_import_params_unref0 (video_import_params); -#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala" video_import_params = _tmp65_; -#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala" _thumbnails_unref0 (_tmp61_); -#line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1984 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp66_ = video_import_params; -#line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1984 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp67_ = video_reader_prepare_for_import (_tmp66_); -#line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1984 "/home/jens/Source/shotwell/src/BatchImport.vala" _result_ = _tmp67_; -#line 16678 "BatchImport.c" +#line 16150 "BatchImport.c" } else { - GFile* _tmp68_ = NULL; - GFile* _tmp69_ = NULL; - ImportID _tmp70_ = {0}; - PreparedFile* _tmp71_ = NULL; - const gchar* _tmp72_ = NULL; - PreparedFile* _tmp73_ = NULL; - const gchar* _tmp74_ = NULL; - PreparedFile* _tmp75_ = NULL; - const gchar* _tmp76_ = NULL; - Thumbnails* _tmp77_ = NULL; - Thumbnails* _tmp78_ = NULL; - PhotoImportParams* _tmp79_ = NULL; - PhotoImportParams* _tmp80_ = NULL; - ImportResult _tmp81_ = 0; -#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp68_; + GFile* _tmp69_; + ImportID _tmp70_; + PreparedFile* _tmp71_; + const gchar* _tmp72_; + PreparedFile* _tmp73_; + const gchar* _tmp74_; + PreparedFile* _tmp75_; + const gchar* _tmp76_; + Thumbnails* _tmp77_; + Thumbnails* _tmp78_; + PhotoImportParams* _tmp79_; + PhotoImportParams* _tmp80_; + ImportResult _tmp81_; +#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp68_ = final_file; -#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp69_ = final_associated_file; -#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp70_ = self->priv->import_id; -#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp71_ = prepared_file; -#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp72_ = _tmp71_->exif_md5; -#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp73_ = prepared_file; -#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp74_ = _tmp73_->thumbnail_md5; -#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp75_ = prepared_file; -#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp76_ = _tmp75_->full_md5; -#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp77_ = thumbnails_new (); -#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp78_ = _tmp77_; -#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp79_ = photo_import_params_new (_tmp68_, _tmp69_, &_tmp70_, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL, _tmp72_, _tmp74_, _tmp76_, _tmp78_); -#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" _photo_import_params_unref0 (photo_import_params); -#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" photo_import_params = _tmp79_; -#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" _thumbnails_unref0 (_tmp78_); -#line 1983 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1990 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp80_ = photo_import_params; -#line 1983 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1990 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp81_ = photo_prepare_for_import (_tmp80_); -#line 1983 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1990 "/home/jens/Source/shotwell/src/BatchImport.vala" _result_ = _tmp81_; -#line 16730 "BatchImport.c" +#line 16202 "BatchImport.c" } -#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp83_ = _result_; -#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp83_ != IMPORT_RESULT_SUCCESS) { -#line 16736 "BatchImport.c" - GFile* _tmp84_ = NULL; - PreparedFile* _tmp85_ = NULL; - GFile* _tmp86_ = NULL; -#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 16208 "BatchImport.c" + GFile* _tmp84_; + PreparedFile* _tmp85_; + GFile* _tmp86_; +#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp84_ = final_file; -#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp85_ = prepared_file; -#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp86_ = _tmp85_->file; -#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp82_ = _tmp84_ != _tmp86_; -#line 16748 "BatchImport.c" +#line 16220 "BatchImport.c" } else { -#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp82_ = FALSE; -#line 16752 "BatchImport.c" +#line 16224 "BatchImport.c" } -#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp82_) { -#line 16756 "BatchImport.c" - GFile* _tmp87_ = NULL; - gchar* _tmp88_ = NULL; - gchar* _tmp89_ = NULL; -#line 1987 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 16228 "BatchImport.c" + GFile* _tmp87_; + gchar* _tmp88_; + gchar* _tmp89_; +#line 1994 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp87_ = final_file; -#line 1987 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1994 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp88_ = g_file_get_path (_tmp87_); -#line 1987 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1994 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp89_ = _tmp88_; -#line 1987 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_debug ("BatchImport.vala:1987: Deleting failed imported copy %s", _tmp89_); -#line 1987 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1994 "/home/jens/Source/shotwell/src/BatchImport.vala" + g_debug ("BatchImport.vala:1994: Deleting failed imported copy %s", _tmp89_); +#line 1994 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp89_); -#line 16770 "BatchImport.c" +#line 16242 "BatchImport.c" { - GFile* _tmp90_ = NULL; -#line 1989 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp90_; +#line 1996 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp90_ = final_file; -#line 1989 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1996 "/home/jens/Source/shotwell/src/BatchImport.vala" g_file_delete (_tmp90_, NULL, &_inner_error_); -#line 1989 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1996 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16779 "BatchImport.c" - goto __catch422_g_error; +#line 16251 "BatchImport.c" + goto __catch423_g_error; } } - goto __finally422; - __catch422_g_error: + goto __finally423; + __catch423_g_error: { GError* err = NULL; - GFile* _tmp91_ = NULL; - gchar* _tmp92_ = NULL; - gchar* _tmp93_ = NULL; - GError* _tmp94_ = NULL; - const gchar* _tmp95_ = NULL; -#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp91_; + gchar* _tmp92_; + gchar* _tmp93_; + GError* _tmp94_; + const gchar* _tmp95_; +#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; -#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; -#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp91_ = final_file; -#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp92_ = g_file_get_path (_tmp91_); -#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp93_ = _tmp92_; -#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp94_ = err; -#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp95_ = _tmp94_->message; -#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_warning ("BatchImport.vala:1992: Unable to delete copy of imported file %s: %s", _tmp93_, _tmp95_); -#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala" + g_warning ("BatchImport.vala:1999: Unable to delete copy of imported file %s: %s", _tmp93_, _tmp95_); +#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp93_); -#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 16812 "BatchImport.c" +#line 16284 "BatchImport.c" } - __finally422: -#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala" + __finally423: +#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala" _photo_import_params_unref0 (photo_import_params); -#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala" _video_import_params_unref0 (video_import_params); -#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (final_associated_file); -#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (final_file); -#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (prepared_file); -#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala" g_clear_error (&_inner_error_); -#line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 16833 "BatchImport.c" +#line 16305 "BatchImport.c" } } -#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp96_ = prepared_file; -#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp97_ = _tmp96_->job; -#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp98_ = final_file; -#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp99_ = final_file; -#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp100_ = g_file_get_path (_tmp99_); -#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp101_ = _tmp100_; -#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp102_ = final_file; -#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp103_ = g_file_get_path (_tmp102_); -#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp104_ = _tmp103_; -#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp105_ = _result_; -#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp106_ = batch_import_result_new (_tmp97_, _tmp98_, _tmp101_, _tmp104_, NULL, _tmp105_); -#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp107_ = _tmp106_; -#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp104_); -#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_free0 (_tmp101_); -#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala" batch_result = _tmp107_; -#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2006 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp108_ = batch_result; -#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2006 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp109_ = _tmp108_->result; -#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2006 "/home/jens/Source/shotwell/src/BatchImport.vala" if (_tmp109_ != IMPORT_RESULT_SUCCESS) { -#line 16872 "BatchImport.c" - BatchImportResult* _tmp110_ = NULL; - BatchImportResult* _tmp111_ = NULL; -#line 2000 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 16344 "BatchImport.c" + BatchImportResult* _tmp110_; + BatchImportResult* _tmp111_; +#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp110_ = batch_result; -#line 2000 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp111_ = _batch_import_result_ref0 (_tmp110_); -#line 2000 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (self->failed); -#line 2000 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" self->failed = _tmp111_; -#line 16883 "BatchImport.c" +#line 16355 "BatchImport.c" } else { - GFile* _tmp112_ = NULL; - PreparedFile* _tmp113_ = NULL; - PhotoImportParams* _tmp114_ = NULL; - VideoImportParams* _tmp115_ = NULL; - BatchImportResult* _tmp116_ = NULL; - ReadyForImport* _tmp117_ = NULL; -#line 2002 "/home/jens/Source/shotwell/src/BatchImport.vala" + GFile* _tmp112_; + PreparedFile* _tmp113_; + PhotoImportParams* _tmp114_; + VideoImportParams* _tmp115_; + BatchImportResult* _tmp116_; + ReadyForImport* _tmp117_; +#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp112_ = final_file; -#line 2002 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp113_ = prepared_file; -#line 2002 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp114_ = photo_import_params; -#line 2002 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp115_ = video_import_params; -#line 2002 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp116_ = batch_result; -#line 2002 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp117_ = ready_for_import_new (_tmp112_, _tmp113_, _tmp114_, _tmp115_, _tmp116_); -#line 2002 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala" _ready_for_import_unref0 (self->ready); -#line 2002 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ready = _tmp117_; -#line 16907 "BatchImport.c" +#line 16379 "BatchImport.c" } -#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (batch_result); -#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala" _photo_import_params_unref0 (photo_import_params); -#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala" _video_import_params_unref0 (video_import_params); -#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (final_associated_file); -#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (final_file); -#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (prepared_file); -#line 16921 "BatchImport.c" +#line 16393 "BatchImport.c" } static void prepared_file_import_job_class_init (PreparedFileImportJobClass * klass) { -#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala" prepared_file_import_job_parent_class = g_type_class_peek_parent (klass); -#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala" ((BackgroundJobClass *) klass)->finalize = prepared_file_import_job_finalize; -#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_class_add_private (klass, sizeof (PreparedFileImportJobPrivate)); -#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) prepared_file_import_job_real_execute; -#line 16934 "BatchImport.c" +#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala" + ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) prepared_file_import_job_real_execute; +#line 16406 "BatchImport.c" } static void prepared_file_import_job_instance_init (PreparedFileImportJob * self) { -#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv = PREPARED_FILE_IMPORT_JOB_GET_PRIVATE (self); -#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ready = NULL; -#line 1921 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1928 "/home/jens/Source/shotwell/src/BatchImport.vala" self->failed = NULL; -#line 16945 "BatchImport.c" +#line 16417 "BatchImport.c" } -static void prepared_file_import_job_finalize (BackgroundJob* obj) { +static void prepared_file_import_job_finalize (BackgroundJob * obj) { PreparedFileImportJob * self; -#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob); -#line 1919 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1926 "/home/jens/Source/shotwell/src/BatchImport.vala" _prepared_file_unref0 (self->not_ready); -#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala" _ready_for_import_unref0 (self->ready); -#line 1921 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1928 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (self->failed); -#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala" BACKGROUND_JOB_CLASS (prepared_file_import_job_parent_class)->finalize (obj); -#line 16961 "BatchImport.c" +#line 16433 "BatchImport.c" } @@ -16984,292 +16456,292 @@ GType prepared_file_import_job_get_type (void) { CompletedImportObject* completed_import_object_construct (GType object_type, MediaSource* source, Thumbnails* thumbnails, BatchImportJob* original_job, BatchImportResult* import_result) { CompletedImportObject* self = NULL; - Thumbnails* _tmp0_ = NULL; - Thumbnails* _tmp1_ = NULL; - BatchImportResult* _tmp2_ = NULL; - BatchImportResult* _tmp3_ = NULL; - MediaSource* _tmp4_ = NULL; - MediaSource* _tmp5_ = NULL; - BatchImportJob* _tmp6_ = NULL; - BatchImportJob* _tmp7_ = NULL; - Thumbnails* _tmp8_ = NULL; - GdkPixbuf* _tmp9_ = NULL; -#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" + Thumbnails* _tmp0_; + Thumbnails* _tmp1_; + BatchImportResult* _tmp2_; + BatchImportResult* _tmp3_; + MediaSource* _tmp4_; + MediaSource* _tmp5_; + BatchImportJob* _tmp6_; + BatchImportJob* _tmp7_; + Thumbnails* _tmp8_; + GdkPixbuf* _tmp9_; +#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL); -#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_THUMBNAILS (thumbnails), NULL); -#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_JOB (original_job), NULL); -#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT_RESULT (import_result), NULL); -#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (CompletedImportObject*) g_type_create_instance (object_type); -#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2023 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = thumbnails; -#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2023 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = _thumbnails_ref0 (_tmp0_); -#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2023 "/home/jens/Source/shotwell/src/BatchImport.vala" _thumbnails_unref0 (self->thumbnails); -#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2023 "/home/jens/Source/shotwell/src/BatchImport.vala" self->thumbnails = _tmp1_; -#line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = import_result; -#line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = _batch_import_result_ref0 (_tmp2_); -#line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (self->batch_result); -#line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala" self->batch_result = _tmp3_; -#line 2018 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = source; -#line 2018 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 2018 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->source); -#line 2018 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" self->source = _tmp5_; -#line 2019 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2026 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = original_job; -#line 2019 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2026 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = _batch_import_job_ref0 (_tmp6_); -#line 2019 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2026 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (self->original_job); -#line 2019 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2026 "/home/jens/Source/shotwell/src/BatchImport.vala" self->original_job = _tmp7_; -#line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = thumbnails; -#line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = thumbnails_get (_tmp8_, THUMBNAIL_CACHE_SIZE_LARGEST); -#line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->user_preview); -#line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala" self->user_preview = _tmp9_; -#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 17041 "BatchImport.c" +#line 16513 "BatchImport.c" } CompletedImportObject* completed_import_object_new (MediaSource* source, Thumbnails* thumbnails, BatchImportJob* original_job, BatchImportResult* import_result) { -#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala" return completed_import_object_construct (TYPE_COMPLETED_IMPORT_OBJECT, source, thumbnails, original_job, import_result); -#line 17048 "BatchImport.c" +#line 16520 "BatchImport.c" } static void value_completed_import_object_init (GValue* value) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 17055 "BatchImport.c" +#line 16527 "BatchImport.c" } static void value_completed_import_object_free_value (GValue* value) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" if (value->data[0].v_pointer) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" completed_import_object_unref (value->data[0].v_pointer); -#line 17064 "BatchImport.c" +#line 16536 "BatchImport.c" } } static void value_completed_import_object_copy_value (const GValue* src_value, GValue* dest_value) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" if (src_value->data[0].v_pointer) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = completed_import_object_ref (src_value->data[0].v_pointer); -#line 17074 "BatchImport.c" +#line 16546 "BatchImport.c" } else { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" dest_value->data[0].v_pointer = NULL; -#line 17078 "BatchImport.c" +#line 16550 "BatchImport.c" } } static gpointer value_completed_import_object_peek_pointer (const GValue* value) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 17086 "BatchImport.c" +#line 16558 "BatchImport.c" } static gchar* value_completed_import_object_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" if (collect_values[0].v_pointer) { -#line 17093 "BatchImport.c" - CompletedImportObject* object; +#line 16565 "BatchImport.c" + CompletedImportObject * object; object = collect_values[0].v_pointer; -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" if (object->parent_instance.g_class == NULL) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 17100 "BatchImport.c" +#line 16572 "BatchImport.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 17104 "BatchImport.c" +#line 16576 "BatchImport.c" } -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = completed_import_object_ref (object); -#line 17108 "BatchImport.c" +#line 16580 "BatchImport.c" } else { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 17112 "BatchImport.c" +#line 16584 "BatchImport.c" } -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 17116 "BatchImport.c" +#line 16588 "BatchImport.c" } static gchar* value_completed_import_object_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - CompletedImportObject** object_p; + CompletedImportObject ** object_p; object_p = collect_values[0].v_pointer; -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!object_p) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 17127 "BatchImport.c" +#line 16599 "BatchImport.c" } -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!value->data[0].v_pointer) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = NULL; -#line 17133 "BatchImport.c" +#line 16605 "BatchImport.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = value->data[0].v_pointer; -#line 17137 "BatchImport.c" +#line 16609 "BatchImport.c" } else { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" *object_p = completed_import_object_ref (value->data[0].v_pointer); -#line 17141 "BatchImport.c" +#line 16613 "BatchImport.c" } -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" return NULL; -#line 17145 "BatchImport.c" +#line 16617 "BatchImport.c" } GParamSpec* param_spec_completed_import_object (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { ParamSpecCompletedImportObject* spec; -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_COMPLETED_IMPORT_OBJECT), NULL); -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" return G_PARAM_SPEC (spec); -#line 17159 "BatchImport.c" +#line 16631 "BatchImport.c" } gpointer value_get_completed_import_object (const GValue* value) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMPLETED_IMPORT_OBJECT), NULL); -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" return value->data[0].v_pointer; -#line 17168 "BatchImport.c" +#line 16640 "BatchImport.c" } void value_set_completed_import_object (GValue* value, gpointer v_object) { - CompletedImportObject* old; -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" + CompletedImportObject * old; +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMPLETED_IMPORT_OBJECT)); -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" old = value->data[0].v_pointer; -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" if (v_object) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_COMPLETED_IMPORT_OBJECT)); -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" completed_import_object_ref (value->data[0].v_pointer); -#line 17188 "BatchImport.c" +#line 16660 "BatchImport.c" } else { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 17192 "BatchImport.c" +#line 16664 "BatchImport.c" } -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" completed_import_object_unref (old); -#line 17198 "BatchImport.c" +#line 16670 "BatchImport.c" } } void value_take_completed_import_object (GValue* value, gpointer v_object) { - CompletedImportObject* old; -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" + CompletedImportObject * old; +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMPLETED_IMPORT_OBJECT)); -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" old = value->data[0].v_pointer; -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" if (v_object) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_COMPLETED_IMPORT_OBJECT)); -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = v_object; -#line 17217 "BatchImport.c" +#line 16689 "BatchImport.c" } else { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" value->data[0].v_pointer = NULL; -#line 17221 "BatchImport.c" +#line 16693 "BatchImport.c" } -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" if (old) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" completed_import_object_unref (old); -#line 17227 "BatchImport.c" +#line 16699 "BatchImport.c" } } static void completed_import_object_class_init (CompletedImportObjectClass * klass) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" completed_import_object_parent_class = g_type_class_peek_parent (klass); -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" ((CompletedImportObjectClass *) klass)->finalize = completed_import_object_finalize; -#line 17237 "BatchImport.c" +#line 16709 "BatchImport.c" } static void completed_import_object_instance_init (CompletedImportObject * self) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" self->ref_count = 1; -#line 17244 "BatchImport.c" +#line 16716 "BatchImport.c" } -static void completed_import_object_finalize (CompletedImportObject* obj) { +static void completed_import_object_finalize (CompletedImportObject * obj) { CompletedImportObject * self; -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COMPLETED_IMPORT_OBJECT, CompletedImportObject); -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" g_signal_handlers_destroy (self); -#line 2008 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2015 "/home/jens/Source/shotwell/src/BatchImport.vala" _thumbnails_unref0 (self->thumbnails); -#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_result_unref0 (self->batch_result); -#line 2010 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->source); -#line 2011 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2018 "/home/jens/Source/shotwell/src/BatchImport.vala" _batch_import_job_unref0 (self->original_job); -#line 2012 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2019 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->user_preview); -#line 17264 "BatchImport.c" +#line 16736 "BatchImport.c" } @@ -17288,183 +16760,183 @@ GType completed_import_object_get_type (void) { gpointer completed_import_object_ref (gpointer instance) { - CompletedImportObject* self; + CompletedImportObject * self; self = instance; -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" g_atomic_int_inc (&self->ref_count); -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" return instance; -#line 17289 "BatchImport.c" +#line 16761 "BatchImport.c" } void completed_import_object_unref (gpointer instance) { - CompletedImportObject* self; + CompletedImportObject * self; self = instance; -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" COMPLETED_IMPORT_OBJECT_GET_CLASS (self)->finalize (self); -#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala" g_type_free_instance ((GTypeInstance *) self); -#line 17302 "BatchImport.c" +#line 16774 "BatchImport.c" } } ThumbnailWriterJob* thumbnail_writer_job_construct (GType object_type, BatchImport* owner, CompletedImportObject* completed_import_source, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancel_callback, void* cancel_callback_target) { ThumbnailWriterJob* self = NULL; - BatchImport* _tmp0_ = NULL; - CompletionCallback _tmp1_ = NULL; - void* _tmp1__target = NULL; - GCancellable* _tmp2_ = NULL; - CancellationCallback _tmp3_ = NULL; - void* _tmp3__target = NULL; - CompletedImportObject* _tmp4_ = NULL; - Thumbnails* _tmp5_ = NULL; - CompletedImportObject* _tmp6_ = NULL; - CompletedImportObject* _tmp7_ = NULL; -#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala" + BatchImport* _tmp0_; + CompletionCallback _tmp1_; + void* _tmp1__target; + GCancellable* _tmp2_; + CancellationCallback _tmp3_; + void* _tmp3__target; + CompletedImportObject* _tmp4_; + Thumbnails* _tmp5_; + CompletedImportObject* _tmp6_; + CompletedImportObject* _tmp7_; +#line 2034 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL); -#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2034 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (IS_COMPLETED_IMPORT_OBJECT (completed_import_source), NULL); -#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2034 "/home/jens/Source/shotwell/src/BatchImport.vala" g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL); -#line 2029 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = owner; -#line 2029 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = callback; -#line 2029 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1__target = callback_target; -#line 2029 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = cancellable; -#line 2029 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = cancel_callback; -#line 2029 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3__target = cancel_callback_target; -#line 2029 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala" self = (ThumbnailWriterJob*) background_import_job_construct (object_type, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target); -#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = completed_import_source; -#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = _tmp4_->thumbnails; -#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala" _vala_assert (_tmp5_ != NULL, "completed_import_source.thumbnails != null"); -#line 2032 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = completed_import_source; -#line 2032 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = _completed_import_object_ref0 (_tmp6_); -#line 2032 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala" _completed_import_object_unref0 (self->completed_import_source); -#line 2032 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala" self->completed_import_source = _tmp7_; -#line 2034 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2041 "/home/jens/Source/shotwell/src/BatchImport.vala" background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW); -#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2034 "/home/jens/Source/shotwell/src/BatchImport.vala" return self; -#line 17357 "BatchImport.c" +#line 16829 "BatchImport.c" } ThumbnailWriterJob* thumbnail_writer_job_new (BatchImport* owner, CompletedImportObject* completed_import_source, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancel_callback, void* cancel_callback_target) { -#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2034 "/home/jens/Source/shotwell/src/BatchImport.vala" return thumbnail_writer_job_construct (TYPE_THUMBNAIL_WRITER_JOB, owner, completed_import_source, callback, callback_target, cancellable, cancel_callback, cancel_callback_target); -#line 17364 "BatchImport.c" +#line 16836 "BatchImport.c" } static void thumbnail_writer_job_real_execute (BackgroundJob* base) { ThumbnailWriterJob * self; - CompletedImportObject* _tmp10_ = NULL; + CompletedImportObject* _tmp10_; GError * _inner_error_ = NULL; -#line 2037 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2044 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob); -#line 17374 "BatchImport.c" +#line 16846 "BatchImport.c" { - CompletedImportObject* _tmp0_ = NULL; - MediaSource* _tmp1_ = NULL; - CompletedImportObject* _tmp2_ = NULL; - Thumbnails* _tmp3_ = NULL; - CompletedImportObject* _tmp4_ = NULL; - BatchImportResult* _tmp5_ = NULL; -#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala" + CompletedImportObject* _tmp0_; + MediaSource* _tmp1_; + CompletedImportObject* _tmp2_; + Thumbnails* _tmp3_; + CompletedImportObject* _tmp4_; + BatchImportResult* _tmp5_; +#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp0_ = self->completed_import_source; -#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp1_ = _tmp0_->source; -#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp2_ = self->completed_import_source; -#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp3_ = _tmp2_->thumbnails; -#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala" thumbnail_cache_import_thumbnails (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp3_, TRUE, &_inner_error_); -#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 17394 "BatchImport.c" - goto __catch423_g_error; +#line 16866 "BatchImport.c" + goto __catch424_g_error; } -#line 2041 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = self->completed_import_source; -#line 2041 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_ = _tmp4_->batch_result; -#line 2041 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp5_->result = IMPORT_RESULT_SUCCESS; -#line 17403 "BatchImport.c" +#line 16875 "BatchImport.c" } - goto __finally423; - __catch423_g_error: + goto __finally424; + __catch424_g_error: { GError* err = NULL; - CompletedImportObject* _tmp6_ = NULL; - BatchImportResult* _tmp7_ = NULL; - GError* _tmp8_ = NULL; - ImportResult _tmp9_ = 0; -#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala" + CompletedImportObject* _tmp6_; + BatchImportResult* _tmp7_; + GError* _tmp8_; + ImportResult _tmp9_; +#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala" err = _inner_error_; -#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala" _inner_error_ = NULL; -#line 2043 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2050 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp6_ = self->completed_import_source; -#line 2043 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2050 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_ = _tmp6_->batch_result; -#line 2043 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2050 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp8_ = err; -#line 2043 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2050 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp9_ = import_result_convert_error (_tmp8_, IMPORT_RESULT_FILE_ERROR); -#line 2043 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2050 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp7_->result = _tmp9_; -#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_error_free0 (err); -#line 17429 "BatchImport.c" +#line 16901 "BatchImport.c" } - __finally423: -#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala" + __finally424: +#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala" g_clear_error (&_inner_error_); -#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala" return; -#line 17440 "BatchImport.c" +#line 16912 "BatchImport.c" } -#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_ = self->completed_import_source; -#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala" _thumbnails_unref0 (_tmp10_->thumbnails); -#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp10_->thumbnails = NULL; -#line 17448 "BatchImport.c" +#line 16920 "BatchImport.c" } static void thumbnail_writer_job_class_init (ThumbnailWriterJobClass * klass) { -#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala" thumbnail_writer_job_parent_class = g_type_class_peek_parent (klass); -#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala" ((BackgroundJobClass *) klass)->finalize = thumbnail_writer_job_finalize; -#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala" - ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) thumbnail_writer_job_real_execute; -#line 17459 "BatchImport.c" +#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala" + ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) thumbnail_writer_job_real_execute; +#line 16931 "BatchImport.c" } @@ -17472,15 +16944,15 @@ static void thumbnail_writer_job_instance_init (ThumbnailWriterJob * self) { } -static void thumbnail_writer_job_finalize (BackgroundJob* obj) { +static void thumbnail_writer_job_finalize (BackgroundJob * obj) { ThumbnailWriterJob * self; -#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob); -#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2032 "/home/jens/Source/shotwell/src/BatchImport.vala" _completed_import_object_unref0 (self->completed_import_source); -#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala" +#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala" BACKGROUND_JOB_CLASS (thumbnail_writer_job_parent_class)->finalize (obj); -#line 17475 "BatchImport.c" +#line 16947 "BatchImport.c" } |