From a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 21 Jan 2017 19:17:10 +0100 Subject: New upstream version 0.25.3 --- src/BatchImport.c | 122 +++++++++++++++++++++++++++--------------------------- 1 file changed, 61 insertions(+), 61 deletions(-) (limited to 'src/BatchImport.c') diff --git a/src/BatchImport.c b/src/BatchImport.c index bc67168..032c624 100644 --- a/src/BatchImport.c +++ b/src/BatchImport.c @@ -1,4 +1,4 @@ -/* BatchImport.c generated by valac 0.32.1, the Vala compiler +/* BatchImport.c generated by valac 0.34.4, the Vala compiler * generated from BatchImport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -5472,7 +5472,7 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const #line 5473 "BatchImport.c" GeeHashSet* _tmp21_ = NULL; #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp21_ = gee_hash_set_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp21_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, 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" @@ -5770,14 +5770,14 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 5773 "BatchImport.c" - goto __catch407_g_error; + goto __catch409_g_error; } #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala" filesize = _tmp11_; #line 5778 "BatchImport.c" } - goto __finally407; - __catch407_g_error: + goto __finally409; + __catch409_g_error: { GError* err = NULL; BatchImportResult* _tmp15_ = NULL; @@ -5810,7 +5810,7 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul _g_error_free0 (err); #line 5812 "BatchImport.c" } - __finally407: + __finally409: #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -8899,11 +8899,11 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun #line 1043 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 8898 "BatchImport.c" - goto __catch408_g_error; + goto __catch410_g_error; } } - goto __finally408; - __catch408_g_error: + goto __finally410; + __catch410_g_error: { GError* e = NULL; BackingPhotoRow* _tmp68_ = NULL; @@ -8929,7 +8929,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun _g_error_free0 (e); #line 8926 "BatchImport.c" } - __finally408: + __finally410: #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -9894,11 +9894,11 @@ static void batch_import_flush_ready_sources (BatchImport* self) { #line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 9891 "BatchImport.c" - goto __catch409_g_error; + goto __catch411_g_error; } } - goto __finally409; - __catch409_g_error: + goto __finally411; + __catch411_g_error: { GError* err = NULL; MediaSource* _tmp65_ = NULL; @@ -9929,7 +9929,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) { _g_error_free0 (err); #line 9924 "BatchImport.c" } - __finally409: + __finally411: #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10413,7 +10413,7 @@ static void batch_import_class_init (BatchImportClass * klass) { #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); #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_TYPE_PIXBUF, G_TYPE_INT); + 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); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10460,7 +10460,7 @@ static void batch_import_instance_init (BatchImport * self) { #line 428 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->last_preparing_ms = (gulong) 0; #line 431 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 431 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->imported_full_md5_table = _tmp0_; #line 433 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -11931,11 +11931,11 @@ static void work_sniffer_real_execute (BackgroundJob* base) { #line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 11927 "BatchImport.c" - goto __catch410_g_error; + goto __catch412_g_error; } } - goto __finally410; - __catch410_g_error: + goto __finally412; + __catch412_g_error: { GError* err = NULL; BatchImportJob* _tmp17_ = NULL; @@ -11976,7 +11976,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) { _g_error_free0 (err); #line 11971 "BatchImport.c" } - __finally410: + __finally412: #line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -12676,11 +12676,11 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr #line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 12672 "BatchImport.c" - goto __catch411_g_error; + goto __catch413_g_error; } } - goto __finally411; - __catch411_g_error: + goto __finally413; + __catch413_g_error: { GError* err = NULL; BatchImportJob* _tmp26_ = NULL; @@ -12724,7 +12724,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr _g_error_free0 (err); #line 12719 "BatchImport.c" } - __finally411: + __finally413: #line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -13013,11 +13013,11 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir #line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 13009 "BatchImport.c" - goto __catch412_g_error; + goto __catch414_g_error; } } - goto __finally412; - __catch412_g_error: + goto __finally414; + __catch414_g_error: { GError* err = NULL; BatchImportJob* _tmp24_ = NULL; @@ -13061,7 +13061,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir _g_error_free0 (err); #line 13056 "BatchImport.c" } - __finally412: + __finally414: #line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -14580,7 +14580,7 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor #line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 14576 "BatchImport.c" - goto __catch413_g_error; + goto __catch415_g_error; } #line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala" if (!_tmp0_) { @@ -14635,8 +14635,8 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor #line 14629 "BatchImport.c" } } - goto __finally413; - __catch413_g_error: + goto __finally415; + __catch415_g_error: { GError* err = NULL; BatchImportJob* _tmp12_ = NULL; @@ -14697,7 +14697,7 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor return result; #line 14692 "BatchImport.c" } - __finally413: + __finally415: #line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -14953,7 +14953,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch #line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 14949 "BatchImport.c" - goto __catch414_g_error; + goto __catch416_g_error; } #line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp20_ = _tmp17_; @@ -14967,8 +14967,8 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch _g_free0 (_tmp17_); #line 14962 "BatchImport.c" } - goto __finally414; - __catch414_g_error: + goto __finally416; + __catch416_g_error: { GError* err = NULL; GFile* _tmp21_ = NULL; @@ -15024,7 +15024,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch return result; #line 15019 "BatchImport.c" } - __finally414: + __finally416: #line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -15135,7 +15135,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch #line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 15131 "BatchImport.c" - goto __catch415_g_error; + goto __catch417_g_error; } #line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp44_ = _tmp41_; @@ -15149,8 +15149,8 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch _media_metadata_unref0 (_tmp41_); #line 15144 "BatchImport.c" } - goto __finally415; - __catch415_g_error: + goto __finally417; + __catch417_g_error: { GError* err = NULL; GFile* _tmp45_ = NULL; @@ -15181,7 +15181,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch _g_error_free0 (err); #line 15175 "BatchImport.c" } - __finally415: + __finally417: #line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -15374,14 +15374,14 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch #line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 15369 "BatchImport.c" - goto __catch416_g_error; + goto __catch418_g_error; } #line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala" filesize = _tmp69_; #line 15374 "BatchImport.c" } - goto __finally416; - __catch416_g_error: + goto __finally418; + __catch418_g_error: { GError* err = NULL; GFile* _tmp75_ = NULL; @@ -15437,7 +15437,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch return result; #line 15431 "BatchImport.c" } - __finally416: + __finally418: #line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -15832,11 +15832,11 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) { #line 1898 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 15827 "BatchImport.c" - goto __catch417_g_error; + goto __catch419_g_error; } } - goto __finally417; - __catch417_g_error: + goto __finally419; + __catch419_g_error: { GError* err = NULL; GFile* _tmp9_ = NULL; @@ -15867,7 +15867,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) { _g_error_free0 (err); #line 15860 "BatchImport.c" } - __finally417: + __finally419: #line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -16384,7 +16384,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { #line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 16378 "BatchImport.c" - goto __catch418_g_error; + goto __catch420_g_error; } #line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp14_ = _tmp10_; @@ -16481,7 +16481,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { #line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (_tmp10_); #line 16475 "BatchImport.c" - goto __catch418_g_error; + goto __catch420_g_error; } #line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp34_ = _tmp30_; @@ -16499,8 +16499,8 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { _g_object_unref0 (_tmp10_); #line 16492 "BatchImport.c" } - goto __finally418; - __catch418_g_error: + goto __finally420; + __catch420_g_error: { GError* err = NULL; gchar* _tmp35_ = NULL; @@ -16591,7 +16591,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { return; #line 16584 "BatchImport.c" } - __finally418: + __finally420: #line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -16778,11 +16778,11 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { #line 1989 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 16772 "BatchImport.c" - goto __catch419_g_error; + goto __catch421_g_error; } } - goto __finally419; - __catch419_g_error: + goto __finally421; + __catch421_g_error: { GError* err = NULL; GFile* _tmp91_ = NULL; @@ -16812,7 +16812,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) { _g_error_free0 (err); #line 16805 "BatchImport.c" } - __finally419: + __finally421: #line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -17393,7 +17393,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) { #line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 17387 "BatchImport.c" - goto __catch420_g_error; + goto __catch422_g_error; } #line 2041 "/home/jens/Source/shotwell/src/BatchImport.vala" _tmp4_ = self->completed_import_source; @@ -17403,8 +17403,8 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) { _tmp5_->result = IMPORT_RESULT_SUCCESS; #line 17396 "BatchImport.c" } - goto __finally420; - __catch420_g_error: + goto __finally422; + __catch422_g_error: { GError* err = NULL; CompletedImportObject* _tmp6_ = NULL; @@ -17429,7 +17429,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) { _g_error_free0 (err); #line 17422 "BatchImport.c" } - __finally420: + __finally422: #line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala" -- cgit v1.2.3