diff options
Diffstat (limited to 'src/LibraryMonitor.c')
| -rw-r--r-- | src/LibraryMonitor.c | 549 |
1 files changed, 275 insertions, 274 deletions
diff --git a/src/LibraryMonitor.c b/src/LibraryMonitor.c index 8f36753..a1234fb 100644 --- a/src/LibraryMonitor.c +++ b/src/LibraryMonitor.c @@ -1,4 +1,4 @@ -/* LibraryMonitor.c generated by valac 0.34.4, the Vala compiler +/* LibraryMonitor.c generated by valac 0.34.7, the Vala compiler * generated from LibraryMonitor.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1941,7 +1941,7 @@ static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaM #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = monitor; #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = gee_hash_set_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp5_ = gee_hash_set_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp6_ = _tmp5_; #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2245,13 +2245,13 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) { #line 2246 "LibraryMonitor.c" } #line 287 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = gee_hash_map_new (TYPE_MEDIA_MONITOR, (GBoxedCopyFunc) g_object_ref, g_object_unref, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp28_ = gee_hash_map_new (TYPE_MEDIA_MONITOR, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 287 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->priv->discovered); #line 287 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->discovered = _tmp28_; #line 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = 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); + _tmp29_ = 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 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->priv->unknown_files); #line 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2590,7 +2590,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn #line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp1_ = 0; #line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); + _data_->_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp2_ = 0; #line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2618,13 +2618,13 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn #line 337 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp3_ = NULL; #line 337 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp3_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _data_->_tmp3_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 337 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->all_candidates = _data_->_tmp3_; #line 338 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp4_ = NULL; #line 338 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp4_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); + _data_->_tmp4_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); #line 338 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->adopted = _data_->_tmp4_; #line 2631 "LibraryMonitor.c" @@ -2875,7 +2875,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp41_ = 0; #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp41_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp40_, GEE_TYPE_COLLECTION, GeeCollection)); + _data_->_tmp41_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp40_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp42_ = 0; #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2895,7 +2895,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn #line 372 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp45_ = NULL; #line 372 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp45_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _data_->_tmp45_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 372 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->all_candidates); #line 372 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4590,7 +4590,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = self->priv->import_queue; #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = _tmp3_; #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4614,7 +4614,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp6_ = self->priv->import_queue; #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _tmp7_; #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4664,7 +4664,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { #line 589 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->last_import_roll_use = _tmp17_; #line 591 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = gee_array_list_new (TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL); + _tmp18_ = gee_array_list_new (TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); #line 591 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" jobs = _tmp18_; #line 4671 "LibraryMonitor.c" @@ -4834,7 +4834,7 @@ static void library_monitor_schedule_next_batch_import (LibraryMonitor* self) { #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = self->priv->batch_import_queue; #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = _tmp3_; #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4934,7 +4934,7 @@ static void library_monitor_discard_current_batch_import (LibraryMonitor* self) #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = self->priv->batch_import_queue; #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp13_ = _tmp12_; #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4981,7 +4981,7 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) { #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = self->priv->batch_import_queue; #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp3_ = _tmp2_; #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5232,7 +5232,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor GeeArrayList* to_tombstone = NULL; GeeArrayList* _tmp29_ = NULL; #line 687 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = gee_array_list_new (TYPE_TOMBSTONED_FILE, (GBoxedCopyFunc) tombstoned_file_ref, tombstoned_file_unref, NULL, NULL, NULL); + _tmp29_ = gee_array_list_new (TYPE_TOMBSTONED_FILE, (GBoxedCopyFunc) tombstoned_file_ref, (GDestroyNotify) tombstoned_file_unref, NULL, NULL, NULL); #line 687 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" to_tombstone = _tmp29_; #line 5239 "LibraryMonitor.c" @@ -5434,7 +5434,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp59_ = self->priv->pending_imports; #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp60_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp60_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp61_ = _tmp60_; #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5704,11 +5704,12 @@ gboolean library_monitor_is_blacklisted (GFile* file) { #line 5705 "LibraryMonitor.c" { GeeHashSet* _tmp0_ = NULL; + gboolean _tmp6_ = FALSE; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = library_monitor_blacklist; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_lock (&__lock_library_monitor_blacklist); -#line 5712 "LibraryMonitor.c" +#line 5713 "LibraryMonitor.c" { GeeHashSet* _tmp1_ = NULL; GFile* _tmp2_ = NULL; @@ -5721,18 +5722,18 @@ gboolean library_monitor_is_blacklisted (GFile* file) { _tmp3_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); #line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" result = _tmp3_; -#line 5725 "LibraryMonitor.c" +#line 5726 "LibraryMonitor.c" { GeeHashSet* _tmp4_ = NULL; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = library_monitor_blacklist; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_unlock (&__lock_library_monitor_blacklist); -#line 5732 "LibraryMonitor.c" +#line 5733 "LibraryMonitor.c" } #line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 5736 "LibraryMonitor.c" +#line 5737 "LibraryMonitor.c" } __finally490: { @@ -5741,15 +5742,15 @@ gboolean library_monitor_is_blacklisted (GFile* file) { _tmp5_ = library_monitor_blacklist; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_unlock (&__lock_library_monitor_blacklist); -#line 5745 "LibraryMonitor.c" +#line 5746 "LibraryMonitor.c" } #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.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 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_clear_error (&_inner_error_); #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - return FALSE; -#line 5753 "LibraryMonitor.c" + return _tmp6_; +#line 5754 "LibraryMonitor.c" } } @@ -5786,7 +5787,7 @@ static gboolean library_monitor_is_supported_filetype (LibraryMonitor* self, GFi result = _tmp5_; #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 5790 "LibraryMonitor.c" +#line 5791 "LibraryMonitor.c" } @@ -5802,11 +5803,11 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { if (!_tmp0_) { #line 767 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 5806 "LibraryMonitor.c" +#line 5807 "LibraryMonitor.c" } #line 769 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" to_import = NULL; -#line 5810 "LibraryMonitor.c" +#line 5811 "LibraryMonitor.c" { GeeIterator* _file_it = NULL; GeeCollection* _tmp1_ = NULL; @@ -5827,7 +5828,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _file_it = _tmp4_; #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 5831 "LibraryMonitor.c" +#line 5832 "LibraryMonitor.c" GeeIterator* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; GFile* file = NULL; @@ -5859,7 +5860,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { if (!_tmp6_) { #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 5863 "LibraryMonitor.c" +#line 5864 "LibraryMonitor.c" } #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp7_ = _file_it; @@ -5879,7 +5880,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { if (_tmp12_ == NULL) { #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = TRUE; -#line 5883 "LibraryMonitor.c" +#line 5884 "LibraryMonitor.c" } else { GFileInfo* _tmp13_ = NULL; GFileType _tmp14_ = 0; @@ -5889,7 +5890,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _tmp14_ = g_file_info_get_file_type (_tmp13_); #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = _tmp14_ != G_FILE_TYPE_REGULAR; -#line 5893 "LibraryMonitor.c" +#line 5894 "LibraryMonitor.c" } #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp11_) { @@ -5899,7 +5900,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _g_object_unref0 (file); #line 773 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5903 "LibraryMonitor.c" +#line 5904 "LibraryMonitor.c" } #line 775 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp15_ = self->priv->pending_imports; @@ -5915,7 +5916,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _g_object_unref0 (file); #line 776 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5919 "LibraryMonitor.c" +#line 5920 "LibraryMonitor.c" } #line 778 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp18_ = tombstone_global; @@ -5931,11 +5932,11 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _g_object_unref0 (file); #line 779 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5935 "LibraryMonitor.c" +#line 5936 "LibraryMonitor.c" } #line 781 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" represented = FALSE; -#line 5939 "LibraryMonitor.c" +#line 5940 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp21_ = NULL; @@ -5963,7 +5964,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _monitor_index = -1; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 5967 "LibraryMonitor.c" +#line 5968 "LibraryMonitor.c" gint _tmp26_ = 0; gint _tmp27_ = 0; gint _tmp28_ = 0; @@ -5986,7 +5987,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { if (!(_tmp27_ < _tmp28_)) { #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 5990 "LibraryMonitor.c" +#line 5991 "LibraryMonitor.c" } #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp29_ = _monitor_list; @@ -6010,15 +6011,15 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _g_object_unref0 (monitor); #line 786 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6014 "LibraryMonitor.c" +#line 6015 "LibraryMonitor.c" } #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6018 "LibraryMonitor.c" +#line 6019 "LibraryMonitor.c" } #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 6022 "LibraryMonitor.c" +#line 6023 "LibraryMonitor.c" } #line 790 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp35_ = represented; @@ -6030,7 +6031,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _g_object_unref0 (file); #line 791 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 6034 "LibraryMonitor.c" +#line 6035 "LibraryMonitor.c" } #line 793 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp36_ = file; @@ -6044,21 +6045,21 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _g_object_unref0 (file); #line 794 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 6048 "LibraryMonitor.c" +#line 6049 "LibraryMonitor.c" } #line 796 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp38_ = to_import; #line 796 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp38_ == NULL) { -#line 6054 "LibraryMonitor.c" +#line 6055 "LibraryMonitor.c" GeeArrayList* _tmp39_ = NULL; #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp39_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp39_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (to_import); #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" to_import = _tmp39_; -#line 6062 "LibraryMonitor.c" +#line 6063 "LibraryMonitor.c" } #line 799 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp40_ = to_import; @@ -6070,27 +6071,27 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _g_object_unref0 (info); #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); -#line 6074 "LibraryMonitor.c" +#line 6075 "LibraryMonitor.c" } #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_file_it); -#line 6078 "LibraryMonitor.c" +#line 6079 "LibraryMonitor.c" } #line 802 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp42_ = to_import; #line 802 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp42_ != NULL) { -#line 6084 "LibraryMonitor.c" +#line 6085 "LibraryMonitor.c" GeeArrayList* _tmp43_ = NULL; #line 803 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp43_ = to_import; #line 803 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_enqueue_import_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 6090 "LibraryMonitor.c" +#line 6091 "LibraryMonitor.c" } #line 765 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (to_import); -#line 6094 "LibraryMonitor.c" +#line 6095 "LibraryMonitor.c" } @@ -6106,7 +6107,7 @@ static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* sel _tmp2_ = self->priv->auto_import; #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp2_) { -#line 6110 "LibraryMonitor.c" +#line 6111 "LibraryMonitor.c" GFile* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6115,15 +6116,15 @@ static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* sel _tmp4_ = library_monitor_is_supported_filetype (self, _tmp3_); #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = _tmp4_; -#line 6119 "LibraryMonitor.c" +#line 6120 "LibraryMonitor.c" } else { #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = FALSE; -#line 6123 "LibraryMonitor.c" +#line 6124 "LibraryMonitor.c" } #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 6127 "LibraryMonitor.c" +#line 6128 "LibraryMonitor.c" TombstoneSourceCollection* _tmp5_ = NULL; GFile* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; @@ -6135,15 +6136,15 @@ static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* sel _tmp7_ = tombstone_source_collection_matches (_tmp5_, _tmp6_); #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = !_tmp7_; -#line 6139 "LibraryMonitor.c" +#line 6140 "LibraryMonitor.c" } else { #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = FALSE; -#line 6143 "LibraryMonitor.c" +#line 6144 "LibraryMonitor.c" } #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { -#line 6147 "LibraryMonitor.c" +#line 6148 "LibraryMonitor.c" GFile* _tmp8_ = NULL; gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; @@ -6170,7 +6171,7 @@ static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* sel _tmp13_ = file; #line 811 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_enqueue_import (self, _tmp13_); -#line 6174 "LibraryMonitor.c" +#line 6175 "LibraryMonitor.c" } } @@ -6196,7 +6197,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _tmp1_ = library_monitor_is_blacklisted (_tmp0_); #line 816 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 6200 "LibraryMonitor.c" +#line 6201 "LibraryMonitor.c" GFile* _tmp2_ = NULL; GFileInfo* _tmp3_ = NULL; #line 817 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6207,11 +6208,11 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_created (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_, _tmp3_); #line 819 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 6211 "LibraryMonitor.c" +#line 6212 "LibraryMonitor.c" } #line 822 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 6215 "LibraryMonitor.c" +#line 6216 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp4_ = NULL; @@ -6239,7 +6240,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _monitor_index = -1; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 6243 "LibraryMonitor.c" +#line 6244 "LibraryMonitor.c" gint _tmp9_ = 0; gint _tmp10_ = 0; gint _tmp11_ = 0; @@ -6263,7 +6264,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF if (!(_tmp10_ < _tmp11_)) { #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6267 "LibraryMonitor.c" +#line 6268 "LibraryMonitor.c" } #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp12_ = _monitor_list; @@ -6289,28 +6290,28 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _g_object_unref0 (monitor); #line 827 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6293 "LibraryMonitor.c" +#line 6294 "LibraryMonitor.c" } #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6297 "LibraryMonitor.c" +#line 6298 "LibraryMonitor.c" } #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 6301 "LibraryMonitor.c" +#line 6302 "LibraryMonitor.c" } #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp19_ = known; #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp19_) { -#line 6307 "LibraryMonitor.c" +#line 6308 "LibraryMonitor.c" GeeHashSet* all_candidates = NULL; gboolean _tmp78_ = FALSE; gboolean _tmp79_ = FALSE; gboolean _tmp80_ = FALSE; #line 833 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" all_candidates = NULL; -#line 6314 "LibraryMonitor.c" +#line 6315 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp20_ = NULL; @@ -6338,7 +6339,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _monitor_index = -1; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 6342 "LibraryMonitor.c" +#line 6343 "LibraryMonitor.c" gint _tmp25_ = 0; gint _tmp26_ = 0; gint _tmp27_ = 0; @@ -6367,7 +6368,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF if (!(_tmp26_ < _tmp27_)) { #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6371 "LibraryMonitor.c" +#line 6372 "LibraryMonitor.c" } #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp28_ = _monitor_list; @@ -6395,18 +6396,18 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF if (_tmp37_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) { #line 838 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp36_ = TRUE; -#line 6399 "LibraryMonitor.c" +#line 6400 "LibraryMonitor.c" } else { MediaMonitorDiscoveredFile _tmp38_ = 0; #line 839 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp38_ = _result_; #line 839 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp36_ = _tmp38_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE; -#line 6406 "LibraryMonitor.c" +#line 6407 "LibraryMonitor.c" } #line 838 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp36_) { -#line 6410 "LibraryMonitor.c" +#line 6411 "LibraryMonitor.c" MediaMonitor* _tmp39_ = NULL; gchar* _tmp40_ = NULL; gchar* _tmp41_ = NULL; @@ -6453,7 +6454,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _g_object_unref0 (monitor); #line 845 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6457 "LibraryMonitor.c" +#line 6458 "LibraryMonitor.c" } else { gboolean _tmp49_ = FALSE; GeeCollection* _tmp50_ = NULL; @@ -6461,7 +6462,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _tmp50_ = candidates; #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp50_ != NULL) { -#line 6465 "LibraryMonitor.c" +#line 6466 "LibraryMonitor.c" GeeCollection* _tmp51_ = NULL; gint _tmp52_ = 0; gint _tmp53_ = 0; @@ -6473,15 +6474,15 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _tmp53_ = _tmp52_; #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp49_ = _tmp53_ > 0; -#line 6477 "LibraryMonitor.c" +#line 6478 "LibraryMonitor.c" } else { #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp49_ = FALSE; -#line 6481 "LibraryMonitor.c" +#line 6482 "LibraryMonitor.c" } #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp49_) { -#line 6485 "LibraryMonitor.c" +#line 6486 "LibraryMonitor.c" MediaMonitor* _tmp54_ = NULL; gchar* _tmp55_ = NULL; gchar* _tmp56_ = NULL; @@ -6528,15 +6529,15 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _tmp65_ = all_candidates; #line 850 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp65_ == NULL) { -#line 6532 "LibraryMonitor.c" +#line 6533 "LibraryMonitor.c" GeeHashSet* _tmp66_ = NULL; #line 851 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp66_ = gee_hash_set_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp66_ = gee_hash_set_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 851 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (all_candidates); #line 851 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" all_candidates = _tmp66_; -#line 6540 "LibraryMonitor.c" +#line 6541 "LibraryMonitor.c" } { GeeIterator* _candidate_it = NULL; @@ -6550,7 +6551,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _candidate_it = _tmp68_; #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 6554 "LibraryMonitor.c" +#line 6555 "LibraryMonitor.c" GeeIterator* _tmp69_ = NULL; gboolean _tmp70_ = FALSE; Monitorable* candidate = NULL; @@ -6567,7 +6568,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF if (!_tmp70_) { #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6571 "LibraryMonitor.c" +#line 6572 "LibraryMonitor.c" } #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp71_ = _candidate_it; @@ -6583,7 +6584,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _tmp75_ = media_monitor_is_offline (_tmp73_, _tmp74_); #line 854 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp75_) { -#line 6587 "LibraryMonitor.c" +#line 6588 "LibraryMonitor.c" GeeHashSet* _tmp76_ = NULL; Monitorable* _tmp77_ = NULL; #line 855 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6592,15 +6593,15 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _tmp77_ = candidate; #line 855 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp77_); -#line 6596 "LibraryMonitor.c" +#line 6597 "LibraryMonitor.c" } #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); -#line 6600 "LibraryMonitor.c" +#line 6601 "LibraryMonitor.c" } #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_candidate_it); -#line 6604 "LibraryMonitor.c" +#line 6605 "LibraryMonitor.c" } } } @@ -6608,51 +6609,51 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _g_object_unref0 (candidates); #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6612 "LibraryMonitor.c" +#line 6613 "LibraryMonitor.c" } #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 6616 "LibraryMonitor.c" +#line 6617 "LibraryMonitor.c" } #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp80_ = known; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp80_) { -#line 6622 "LibraryMonitor.c" +#line 6623 "LibraryMonitor.c" GeeHashSet* _tmp81_ = NULL; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp81_ = all_candidates; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp79_ = _tmp81_ != NULL; -#line 6628 "LibraryMonitor.c" +#line 6629 "LibraryMonitor.c" } else { #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp79_ = FALSE; -#line 6632 "LibraryMonitor.c" +#line 6633 "LibraryMonitor.c" } #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp79_) { -#line 6636 "LibraryMonitor.c" +#line 6637 "LibraryMonitor.c" GeeHashSet* _tmp82_ = NULL; gint _tmp83_ = 0; gint _tmp84_ = 0; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp82_ = all_candidates; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp83_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp83_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp84_ = _tmp83_; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp78_ = _tmp84_ > 0; -#line 6648 "LibraryMonitor.c" +#line 6649 "LibraryMonitor.c" } else { #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp78_ = FALSE; -#line 6652 "LibraryMonitor.c" +#line 6653 "LibraryMonitor.c" } #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp78_) { -#line 6656 "LibraryMonitor.c" +#line 6657 "LibraryMonitor.c" GeeHashSet* _tmp85_ = NULL; gint _tmp86_ = 0; gint _tmp87_ = 0; @@ -6669,7 +6670,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp85_ = all_candidates; #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp86_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp86_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp87_ = _tmp86_; #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6704,23 +6705,23 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _background_job_unref0 (_tmp97_); #line 866 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = TRUE; -#line 6708 "LibraryMonitor.c" +#line 6709 "LibraryMonitor.c" } #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (all_candidates); -#line 6712 "LibraryMonitor.c" +#line 6713 "LibraryMonitor.c" } #line 870 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp98_ = known; #line 870 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp98_) { -#line 6718 "LibraryMonitor.c" +#line 6719 "LibraryMonitor.c" GFile* _tmp99_ = NULL; #line 871 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp99_ = file; #line 871 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_runtime_unknown_file_discovered (self, _tmp99_); -#line 6724 "LibraryMonitor.c" +#line 6725 "LibraryMonitor.c" } #line 873 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp100_ = file; @@ -6728,7 +6729,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _tmp101_ = info; #line 873 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_created (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp100_, _tmp101_); -#line 6732 "LibraryMonitor.c" +#line 6733 "LibraryMonitor.c" } @@ -6756,7 +6757,7 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self _tmp3_ = _tmp2_->err; #line 879 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp3_ != NULL) { -#line 6760 "LibraryMonitor.c" +#line 6761 "LibraryMonitor.c" LibraryMonitorRuntimeFindMoveJob* _tmp4_ = NULL; GFile* _tmp5_ = NULL; gchar* _tmp6_ = NULL; @@ -6783,7 +6784,7 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self "or %s: %s", _tmp7_, _tmp10_); #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp7_); -#line 6786 "LibraryMonitor.c" +#line 6787 "LibraryMonitor.c" } #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = job; @@ -6791,7 +6792,7 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self _tmp12_ = _tmp11_->match; #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp12_ != NULL) { -#line 6794 "LibraryMonitor.c" +#line 6795 "LibraryMonitor.c" MediaMonitor* monitor = NULL; LibraryMonitorRuntimeFindMoveJob* _tmp13_ = NULL; Monitorable* _tmp14_ = NULL; @@ -6834,7 +6835,7 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self media_monitor_update_online (_tmp21_, _tmp23_); #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6837 "LibraryMonitor.c" +#line 6838 "LibraryMonitor.c" } else { LibraryMonitorRuntimeFindMoveJob* _tmp24_ = NULL; GFile* _tmp25_ = NULL; @@ -6844,11 +6845,11 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self _tmp25_ = _tmp24_->file; #line 890 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_runtime_unknown_file_discovered (self, _tmp25_); -#line 6847 "LibraryMonitor.c" +#line 6848 "LibraryMonitor.c" } #line 876 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _background_job_unref0 (job); -#line 6851 "LibraryMonitor.c" +#line 6852 "LibraryMonitor.c" } @@ -6878,7 +6879,7 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil if (_tmp2_) { #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = TRUE; -#line 6881 "LibraryMonitor.c" +#line 6882 "LibraryMonitor.c" } else { GFile* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; @@ -6888,11 +6889,11 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil _tmp4_ = library_monitor_is_blacklisted (_tmp3_); #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = _tmp4_; -#line 6891 "LibraryMonitor.c" +#line 6892 "LibraryMonitor.c" } #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { -#line 6895 "LibraryMonitor.c" +#line 6896 "LibraryMonitor.c" GFile* _tmp5_ = NULL; GFile* _tmp6_ = NULL; GFileInfo* _tmp7_ = NULL; @@ -6906,11 +6907,11 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_moved (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp5_, _tmp6_, _tmp7_); #line 898 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 6909 "LibraryMonitor.c" +#line 6910 "LibraryMonitor.c" } #line 901 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 6913 "LibraryMonitor.c" +#line 6914 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp8_ = NULL; @@ -6938,7 +6939,7 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil _monitor_index = -1; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 6941 "LibraryMonitor.c" +#line 6942 "LibraryMonitor.c" gint _tmp13_ = 0; gint _tmp14_ = 0; gint _tmp15_ = 0; @@ -6963,7 +6964,7 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil if (!(_tmp14_ < _tmp15_)) { #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6966 "LibraryMonitor.c" +#line 6967 "LibraryMonitor.c" } #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp16_ = _monitor_list; @@ -6991,27 +6992,27 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil _g_object_unref0 (monitor); #line 906 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6994 "LibraryMonitor.c" +#line 6995 "LibraryMonitor.c" } #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6998 "LibraryMonitor.c" +#line 6999 "LibraryMonitor.c" } #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7002 "LibraryMonitor.c" +#line 7003 "LibraryMonitor.c" } #line 910 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp24_ = known; #line 910 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp24_) { -#line 7008 "LibraryMonitor.c" +#line 7009 "LibraryMonitor.c" GFile* _tmp25_ = NULL; #line 911 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp25_ = new_file; #line 911 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_runtime_unknown_file_discovered (self, _tmp25_); -#line 7014 "LibraryMonitor.c" +#line 7015 "LibraryMonitor.c" } #line 913 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp26_ = old_file; @@ -7021,7 +7022,7 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil _tmp28_ = new_info; #line 913 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_moved (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp26_, _tmp27_, _tmp28_); -#line 7024 "LibraryMonitor.c" +#line 7025 "LibraryMonitor.c" } @@ -7042,7 +7043,7 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF _tmp1_ = library_monitor_is_blacklisted (_tmp0_); #line 917 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 7045 "LibraryMonitor.c" +#line 7046 "LibraryMonitor.c" GFile* _tmp2_ = NULL; #line 918 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = file; @@ -7050,11 +7051,11 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_); #line 920 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7053 "LibraryMonitor.c" +#line 7054 "LibraryMonitor.c" } #line 923 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 7057 "LibraryMonitor.c" +#line 7058 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp3_ = NULL; @@ -7082,7 +7083,7 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF _monitor_index = -1; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7085 "LibraryMonitor.c" +#line 7086 "LibraryMonitor.c" gint _tmp8_ = 0; gint _tmp9_ = 0; gint _tmp10_ = 0; @@ -7105,7 +7106,7 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF if (!(_tmp9_ < _tmp10_)) { #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7108 "LibraryMonitor.c" +#line 7109 "LibraryMonitor.c" } #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = _monitor_list; @@ -7129,33 +7130,33 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF _g_object_unref0 (monitor); #line 928 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7132 "LibraryMonitor.c" +#line 7133 "LibraryMonitor.c" } #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 7136 "LibraryMonitor.c" +#line 7137 "LibraryMonitor.c" } #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7140 "LibraryMonitor.c" +#line 7141 "LibraryMonitor.c" } #line 932 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = known; #line 932 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp17_) { -#line 7146 "LibraryMonitor.c" +#line 7147 "LibraryMonitor.c" GFile* _tmp18_ = NULL; #line 933 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp18_ = file; #line 933 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_runtime_unknown_file_discovered (self, _tmp18_); -#line 7152 "LibraryMonitor.c" +#line 7153 "LibraryMonitor.c" } #line 935 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp19_ = file; #line 935 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp19_); -#line 7158 "LibraryMonitor.c" +#line 7159 "LibraryMonitor.c" } @@ -7176,7 +7177,7 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito _tmp1_ = library_monitor_is_blacklisted (_tmp0_); #line 939 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 7179 "LibraryMonitor.c" +#line 7180 "LibraryMonitor.c" GFile* _tmp2_ = NULL; #line 940 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = file; @@ -7184,11 +7185,11 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_attributes_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_); #line 942 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7187 "LibraryMonitor.c" +#line 7188 "LibraryMonitor.c" } #line 945 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 7191 "LibraryMonitor.c" +#line 7192 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp3_ = NULL; @@ -7216,7 +7217,7 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito _monitor_index = -1; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7219 "LibraryMonitor.c" +#line 7220 "LibraryMonitor.c" gint _tmp8_ = 0; gint _tmp9_ = 0; gint _tmp10_ = 0; @@ -7239,7 +7240,7 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito if (!(_tmp9_ < _tmp10_)) { #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7242 "LibraryMonitor.c" +#line 7243 "LibraryMonitor.c" } #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = _monitor_list; @@ -7263,33 +7264,33 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito _g_object_unref0 (monitor); #line 950 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7266 "LibraryMonitor.c" +#line 7267 "LibraryMonitor.c" } #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 7270 "LibraryMonitor.c" +#line 7271 "LibraryMonitor.c" } #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7274 "LibraryMonitor.c" +#line 7275 "LibraryMonitor.c" } #line 954 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = known; #line 954 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp17_) { -#line 7280 "LibraryMonitor.c" +#line 7281 "LibraryMonitor.c" GFile* _tmp18_ = NULL; #line 955 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp18_ = file; #line 955 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_runtime_unknown_file_discovered (self, _tmp18_); -#line 7286 "LibraryMonitor.c" +#line 7287 "LibraryMonitor.c" } #line 957 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp19_ = file; #line 957 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_attributes_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp19_); -#line 7292 "LibraryMonitor.c" +#line 7293 "LibraryMonitor.c" } @@ -7313,7 +7314,7 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni _tmp1_ = library_monitor_is_blacklisted (_tmp0_); #line 961 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 7316 "LibraryMonitor.c" +#line 7317 "LibraryMonitor.c" GFile* _tmp2_ = NULL; GFileInfo* _tmp3_ = NULL; #line 962 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7324,11 +7325,11 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_alteration_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_, _tmp3_); #line 964 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7327 "LibraryMonitor.c" +#line 7328 "LibraryMonitor.c" } #line 967 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 7331 "LibraryMonitor.c" +#line 7332 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp4_ = NULL; @@ -7356,7 +7357,7 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni _monitor_index = -1; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7359 "LibraryMonitor.c" +#line 7360 "LibraryMonitor.c" gint _tmp9_ = 0; gint _tmp10_ = 0; gint _tmp11_ = 0; @@ -7380,7 +7381,7 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni if (!(_tmp10_ < _tmp11_)) { #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7383 "LibraryMonitor.c" +#line 7384 "LibraryMonitor.c" } #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp12_ = _monitor_list; @@ -7406,27 +7407,27 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni _g_object_unref0 (monitor); #line 972 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7409 "LibraryMonitor.c" +#line 7410 "LibraryMonitor.c" } #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 7413 "LibraryMonitor.c" +#line 7414 "LibraryMonitor.c" } #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7417 "LibraryMonitor.c" +#line 7418 "LibraryMonitor.c" } #line 976 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp19_ = known; #line 976 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp19_) { -#line 7423 "LibraryMonitor.c" +#line 7424 "LibraryMonitor.c" GFile* _tmp20_ = NULL; #line 977 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp20_ = file; #line 977 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_runtime_unknown_file_discovered (self, _tmp20_); -#line 7429 "LibraryMonitor.c" +#line 7430 "LibraryMonitor.c" } #line 979 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp21_ = file; @@ -7434,7 +7435,7 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni _tmp22_ = info; #line 979 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_alteration_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp21_, _tmp22_); -#line 7437 "LibraryMonitor.c" +#line 7438 "LibraryMonitor.c" } @@ -7455,7 +7456,7 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF _tmp1_ = library_monitor_is_blacklisted (_tmp0_); #line 983 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 7458 "LibraryMonitor.c" +#line 7459 "LibraryMonitor.c" GFile* _tmp2_ = NULL; #line 984 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = file; @@ -7463,11 +7464,11 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_deleted (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_); #line 986 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7466 "LibraryMonitor.c" +#line 7467 "LibraryMonitor.c" } #line 989 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 7470 "LibraryMonitor.c" +#line 7471 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp3_ = NULL; @@ -7495,7 +7496,7 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF _monitor_index = -1; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7498 "LibraryMonitor.c" +#line 7499 "LibraryMonitor.c" gint _tmp8_ = 0; gint _tmp9_ = 0; gint _tmp10_ = 0; @@ -7518,7 +7519,7 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF if (!(_tmp9_ < _tmp10_)) { #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7521 "LibraryMonitor.c" +#line 7522 "LibraryMonitor.c" } #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = _monitor_list; @@ -7542,21 +7543,21 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF _g_object_unref0 (monitor); #line 994 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7545 "LibraryMonitor.c" +#line 7546 "LibraryMonitor.c" } #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 7549 "LibraryMonitor.c" +#line 7550 "LibraryMonitor.c" } #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7553 "LibraryMonitor.c" +#line 7554 "LibraryMonitor.c" } #line 998 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = known; #line 998 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp17_) { -#line 7559 "LibraryMonitor.c" +#line 7560 "LibraryMonitor.c" Tombstone* tombstone = NULL; TombstoneSourceCollection* _tmp18_ = NULL; GFile* _tmp19_ = NULL; @@ -7575,7 +7576,7 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF _tmp21_ = tombstone; #line 1001 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp21_ != NULL) { -#line 7578 "LibraryMonitor.c" +#line 7579 "LibraryMonitor.c" GFile* _tmp22_ = NULL; gchar* _tmp23_ = NULL; gchar* _tmp24_ = NULL; @@ -7597,7 +7598,7 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF _tmp26_ = tombstone; #line 1003 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" tombstone_source_collection_resurrect (_tmp25_, _tmp26_); -#line 7600 "LibraryMonitor.c" +#line 7601 "LibraryMonitor.c" } #line 1007 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp27_ = file; @@ -7605,13 +7606,13 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF library_monitor_remove_queued_import (self, _tmp27_); #line 998 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (tombstone); -#line 7608 "LibraryMonitor.c" +#line 7609 "LibraryMonitor.c" } #line 1010 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp28_ = file; #line 1010 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_deleted (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp28_); -#line 7614 "LibraryMonitor.c" +#line 7615 "LibraryMonitor.c" } @@ -7630,19 +7631,19 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * data1 = closure->data; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" data2 = param_values->data[0].v_pointer; -#line 7633 "LibraryMonitor.c" +#line 7634 "LibraryMonitor.c" } else { #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" data1 = param_values->data[0].v_pointer; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" data2 = closure->data; -#line 7639 "LibraryMonitor.c" +#line 7640 "LibraryMonitor.c" } #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2); -#line 7645 "LibraryMonitor.c" +#line 7646 "LibraryMonitor.c" } @@ -7661,33 +7662,33 @@ static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GVa data1 = closure->data; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" data2 = param_values->data[0].v_pointer; -#line 7664 "LibraryMonitor.c" +#line 7665 "LibraryMonitor.c" } else { #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" data1 = param_values->data[0].v_pointer; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" data2 = closure->data; -#line 7670 "LibraryMonitor.c" +#line 7671 "LibraryMonitor.c" } #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" callback = (GMarshalFunc_VOID__UINT64_UINT64) (marshal_data ? marshal_data : cc->callback); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" callback (data1, g_value_get_uint64 (param_values + 1), g_value_get_uint64 (param_values + 2), data2); -#line 7676 "LibraryMonitor.c" +#line 7677 "LibraryMonitor.c" } static void _library_monitor_on_find_move_completed_completion_callback (BackgroundJob* job, gpointer self) { #line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_find_move_completed ((LibraryMonitor*) self, job); -#line 7683 "LibraryMonitor.c" +#line 7684 "LibraryMonitor.c" } static void _library_monitor_on_find_move_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { #line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_find_move_cancelled ((LibraryMonitor*) self, job); -#line 7690 "LibraryMonitor.c" +#line 7691 "LibraryMonitor.c" } @@ -7740,21 +7741,21 @@ static LibraryMonitorFindMoveJob* library_monitor_find_move_job_construct (GType background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW); #line 110 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self; -#line 7743 "LibraryMonitor.c" +#line 7744 "LibraryMonitor.c" } static LibraryMonitorFindMoveJob* library_monitor_find_move_job_new (LibraryMonitor* owner, GFile* file, GeeCollection* candidates) { #line 110 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return library_monitor_find_move_job_construct (LIBRARY_MONITOR_TYPE_FIND_MOVE_JOB, owner, file, candidates); -#line 7750 "LibraryMonitor.c" +#line 7751 "LibraryMonitor.c" } static gpointer _g_error_copy0 (gpointer self) { #line 135 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self ? g_error_copy (self) : NULL; -#line 7757 "LibraryMonitor.c" +#line 7758 "LibraryMonitor.c" } @@ -7778,7 +7779,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { iter = _tmp1_; #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7781 "LibraryMonitor.c" +#line 7782 "LibraryMonitor.c" GeeIterator* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; GeeIterator* _tmp4_ = NULL; @@ -7796,7 +7797,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { if (!_tmp3_) { #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7799 "LibraryMonitor.c" +#line 7800 "LibraryMonitor.c" } #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = iter; @@ -7818,13 +7819,13 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { _g_object_unref0 (_tmp6_); #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp10_) { -#line 7821 "LibraryMonitor.c" +#line 7822 "LibraryMonitor.c" GeeIterator* _tmp11_ = NULL; #line 124 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = iter; #line 124 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" gee_iterator_remove (_tmp11_); -#line 7827 "LibraryMonitor.c" +#line 7828 "LibraryMonitor.c" } } #line 128 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7839,11 +7840,11 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { _g_object_unref0 (iter); #line 129 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7842 "LibraryMonitor.c" +#line 7843 "LibraryMonitor.c" } #line 131 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" md5 = NULL; -#line 7846 "LibraryMonitor.c" +#line 7847 "LibraryMonitor.c" { gchar* _tmp15_ = NULL; GFile* _tmp16_ = NULL; @@ -7857,7 +7858,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { _tmp15_ = _tmp17_; #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7860 "LibraryMonitor.c" +#line 7861 "LibraryMonitor.c" goto __catch491_g_error; } #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7870,7 +7871,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { md5 = _tmp18_; #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp15_); -#line 7873 "LibraryMonitor.c" +#line 7874 "LibraryMonitor.c" } goto __finally491; __catch491_g_error: @@ -7898,7 +7899,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { _g_object_unref0 (iter); #line 137 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7901 "LibraryMonitor.c" +#line 7902 "LibraryMonitor.c" } __finally491: #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7913,7 +7914,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { g_clear_error (&_inner_error_); #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7916 "LibraryMonitor.c" +#line 7917 "LibraryMonitor.c" } { GeeIterator* _candidate_it = NULL; @@ -7927,7 +7928,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { _candidate_it = _tmp22_; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7930 "LibraryMonitor.c" +#line 7931 "LibraryMonitor.c" GeeIterator* _tmp23_ = NULL; gboolean _tmp24_ = FALSE; Monitorable* candidate = NULL; @@ -7949,7 +7950,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { if (!_tmp24_) { #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7952 "LibraryMonitor.c" +#line 7953 "LibraryMonitor.c" } #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp25_ = _candidate_it; @@ -7975,13 +7976,13 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { _g_object_unref0 (candidate); #line 142 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 7978 "LibraryMonitor.c" +#line 7979 "LibraryMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp32_ = self->match; #line 144 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp32_ != NULL) { -#line 7984 "LibraryMonitor.c" +#line 7985 "LibraryMonitor.c" GFile* _tmp33_ = NULL; gchar* _tmp34_ = NULL; gchar* _tmp35_ = NULL; @@ -8025,15 +8026,15 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { _tmp42_ = self->losers; #line 148 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp42_ == NULL) { -#line 8027 "LibraryMonitor.c" +#line 8028 "LibraryMonitor.c" GeeArrayList* _tmp43_ = NULL; #line 149 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp43_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp43_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 149 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->losers); #line 149 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->losers = _tmp43_; -#line 8035 "LibraryMonitor.c" +#line 8036 "LibraryMonitor.c" } #line 151 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp44_ = self->losers; @@ -8045,7 +8046,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { _g_object_unref0 (candidate); #line 153 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 8047 "LibraryMonitor.c" +#line 8048 "LibraryMonitor.c" } #line 156 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp46_ = candidate; @@ -8057,17 +8058,17 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { self->match = _tmp47_; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); -#line 8059 "LibraryMonitor.c" +#line 8060 "LibraryMonitor.c" } #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_candidate_it); -#line 8063 "LibraryMonitor.c" +#line 8064 "LibraryMonitor.c" } #line 119 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (md5); #line 119 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (iter); -#line 8069 "LibraryMonitor.c" +#line 8070 "LibraryMonitor.c" } @@ -8077,8 +8078,8 @@ static void library_monitor_find_move_job_class_init (LibraryMonitorFindMoveJobC #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ((BackgroundJobClass *) klass)->finalize = library_monitor_find_move_job_finalize; #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((BackgroundJobClass *) klass)->execute = library_monitor_find_move_job_real_execute; -#line 8080 "LibraryMonitor.c" + ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) library_monitor_find_move_job_real_execute; +#line 8081 "LibraryMonitor.c" } @@ -8089,7 +8090,7 @@ static void library_monitor_find_move_job_instance_init (LibraryMonitorFindMoveJ self->losers = NULL; #line 108 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->err = NULL; -#line 8091 "LibraryMonitor.c" +#line 8092 "LibraryMonitor.c" } @@ -8109,7 +8110,7 @@ static void library_monitor_find_move_job_finalize (BackgroundJob* obj) { _g_error_free0 (self->err); #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" BACKGROUND_JOB_CLASS (library_monitor_find_move_job_parent_class)->finalize (obj); -#line 8111 "LibraryMonitor.c" +#line 8112 "LibraryMonitor.c" } @@ -8128,7 +8129,7 @@ static GType library_monitor_find_move_job_get_type (void) { static void _library_monitor_on_runtime_find_move_completed_completion_callback (BackgroundJob* job, gpointer self) { #line 168 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_runtime_find_move_completed ((LibraryMonitor*) self, job); -#line 8130 "LibraryMonitor.c" +#line 8131 "LibraryMonitor.c" } @@ -8178,14 +8179,14 @@ static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_c background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW); #line 167 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self; -#line 8180 "LibraryMonitor.c" +#line 8181 "LibraryMonitor.c" } static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_new (LibraryMonitor* owner, GFile* file, GeeCollection* candidates) { #line 167 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return library_monitor_runtime_find_move_job_construct (LIBRARY_MONITOR_TYPE_RUNTIME_FIND_MOVE_JOB, owner, file, candidates); -#line 8187 "LibraryMonitor.c" +#line 8188 "LibraryMonitor.c" } @@ -8197,7 +8198,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_MONITOR_TYPE_RUNTIME_FIND_MOVE_JOB, LibraryMonitorRuntimeFindMoveJob); #line 177 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" md5 = NULL; -#line 8199 "LibraryMonitor.c" +#line 8200 "LibraryMonitor.c" { gchar* _tmp0_ = NULL; GFile* _tmp1_ = NULL; @@ -8211,7 +8212,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b _tmp0_ = _tmp2_; #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8213 "LibraryMonitor.c" +#line 8214 "LibraryMonitor.c" goto __catch492_g_error; } #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8224,7 +8225,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b md5 = _tmp3_; #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp0_); -#line 8226 "LibraryMonitor.c" +#line 8227 "LibraryMonitor.c" } goto __finally492; __catch492_g_error: @@ -8250,7 +8251,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b _g_free0 (md5); #line 183 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 8252 "LibraryMonitor.c" +#line 8253 "LibraryMonitor.c" } __finally492: #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8263,7 +8264,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b g_clear_error (&_inner_error_); #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 8265 "LibraryMonitor.c" +#line 8266 "LibraryMonitor.c" } { GeeIterator* _candidate_it = NULL; @@ -8277,7 +8278,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b _candidate_it = _tmp7_; #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 8279 "LibraryMonitor.c" +#line 8280 "LibraryMonitor.c" GeeIterator* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; Monitorable* candidate = NULL; @@ -8296,7 +8297,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b if (!_tmp9_) { #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 8298 "LibraryMonitor.c" +#line 8299 "LibraryMonitor.c" } #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp10_ = _candidate_it; @@ -8318,7 +8319,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b _g_free0 (_tmp14_); #line 187 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp16_) { -#line 8320 "LibraryMonitor.c" +#line 8321 "LibraryMonitor.c" Monitorable* _tmp17_ = NULL; Monitorable* _tmp18_ = NULL; #line 188 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8333,19 +8334,19 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b _g_object_unref0 (candidate); #line 190 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 8335 "LibraryMonitor.c" +#line 8336 "LibraryMonitor.c" } #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); -#line 8339 "LibraryMonitor.c" +#line 8340 "LibraryMonitor.c" } #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_candidate_it); -#line 8343 "LibraryMonitor.c" +#line 8344 "LibraryMonitor.c" } #line 176 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (md5); -#line 8347 "LibraryMonitor.c" +#line 8348 "LibraryMonitor.c" } @@ -8355,8 +8356,8 @@ static void library_monitor_runtime_find_move_job_class_init (LibraryMonitorRunt #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ((BackgroundJobClass *) klass)->finalize = library_monitor_runtime_find_move_job_finalize; #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((BackgroundJobClass *) klass)->execute = library_monitor_runtime_find_move_job_real_execute; -#line 8358 "LibraryMonitor.c" + ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) library_monitor_runtime_find_move_job_real_execute; +#line 8359 "LibraryMonitor.c" } @@ -8365,7 +8366,7 @@ static void library_monitor_runtime_find_move_job_instance_init (LibraryMonitorR self->match = NULL; #line 165 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->err = NULL; -#line 8367 "LibraryMonitor.c" +#line 8368 "LibraryMonitor.c" } @@ -8383,7 +8384,7 @@ static void library_monitor_runtime_find_move_job_finalize (BackgroundJob* obj) _g_error_free0 (self->err); #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" BACKGROUND_JOB_CLASS (library_monitor_runtime_find_move_job_parent_class)->finalize (obj); -#line 8385 "LibraryMonitor.c" +#line 8386 "LibraryMonitor.c" } @@ -8429,21 +8430,21 @@ static LibraryMonitorVerifyJob* library_monitor_verify_job_construct (GType obje self->monitor = _tmp3_; #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self; -#line 8431 "LibraryMonitor.c" +#line 8432 "LibraryMonitor.c" } static LibraryMonitorVerifyJob* library_monitor_verify_job_new (Monitorable* monitorable, MediaMonitor* monitor) { #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return library_monitor_verify_job_construct (LIBRARY_MONITOR_TYPE_VERIFY_JOB, monitorable, monitor); -#line 8438 "LibraryMonitor.c" +#line 8439 "LibraryMonitor.c" } static void library_monitor_value_verify_job_init (GValue* value) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 8445 "LibraryMonitor.c" +#line 8446 "LibraryMonitor.c" } @@ -8452,7 +8453,7 @@ static void library_monitor_value_verify_job_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_job_unref (value->data[0].v_pointer); -#line 8454 "LibraryMonitor.c" +#line 8455 "LibraryMonitor.c" } } @@ -8462,11 +8463,11 @@ static void library_monitor_value_verify_job_copy_value (const GValue* src_value if (src_value->data[0].v_pointer) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" dest_value->data[0].v_pointer = library_monitor_verify_job_ref (src_value->data[0].v_pointer); -#line 8464 "LibraryMonitor.c" +#line 8465 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 8468 "LibraryMonitor.c" +#line 8469 "LibraryMonitor.c" } } @@ -8474,37 +8475,37 @@ static void library_monitor_value_verify_job_copy_value (const GValue* src_value static gpointer library_monitor_value_verify_job_peek_pointer (const GValue* value) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return value->data[0].v_pointer; -#line 8476 "LibraryMonitor.c" +#line 8477 "LibraryMonitor.c" } static gchar* library_monitor_value_verify_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (collect_values[0].v_pointer) { -#line 8483 "LibraryMonitor.c" +#line 8484 "LibraryMonitor.c" LibraryMonitorVerifyJob* object; object = collect_values[0].v_pointer; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (object->parent_instance.g_class == NULL) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8490 "LibraryMonitor.c" +#line 8491 "LibraryMonitor.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.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 8494 "LibraryMonitor.c" +#line 8495 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = library_monitor_verify_job_ref (object); -#line 8498 "LibraryMonitor.c" +#line 8499 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 8502 "LibraryMonitor.c" +#line 8503 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return NULL; -#line 8506 "LibraryMonitor.c" +#line 8507 "LibraryMonitor.c" } @@ -8515,25 +8516,25 @@ static gchar* library_monitor_value_verify_job_lcopy_value (const GValue* value, if (!object_p) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8517 "LibraryMonitor.c" +#line 8518 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!value->data[0].v_pointer) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *object_p = NULL; -#line 8523 "LibraryMonitor.c" +#line 8524 "LibraryMonitor.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *object_p = value->data[0].v_pointer; -#line 8527 "LibraryMonitor.c" +#line 8528 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *object_p = library_monitor_verify_job_ref (value->data[0].v_pointer); -#line 8531 "LibraryMonitor.c" +#line 8532 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return NULL; -#line 8535 "LibraryMonitor.c" +#line 8536 "LibraryMonitor.c" } @@ -8547,7 +8548,7 @@ static GParamSpec* library_monitor_param_spec_verify_job (const gchar* name, con G_PARAM_SPEC (spec)->value_type = object_type; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return G_PARAM_SPEC (spec); -#line 8549 "LibraryMonitor.c" +#line 8550 "LibraryMonitor.c" } @@ -8556,7 +8557,7 @@ static gpointer library_monitor_value_get_verify_job (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, LIBRARY_MONITOR_TYPE_VERIFY_JOB), NULL); #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return value->data[0].v_pointer; -#line 8558 "LibraryMonitor.c" +#line 8559 "LibraryMonitor.c" } @@ -8576,17 +8577,17 @@ static void library_monitor_value_set_verify_job (GValue* value, gpointer v_obje value->data[0].v_pointer = v_object; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_job_ref (value->data[0].v_pointer); -#line 8578 "LibraryMonitor.c" +#line 8579 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 8582 "LibraryMonitor.c" +#line 8583 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (old) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_job_unref (old); -#line 8588 "LibraryMonitor.c" +#line 8589 "LibraryMonitor.c" } } @@ -8605,17 +8606,17 @@ static void library_monitor_value_take_verify_job (GValue* value, gpointer v_obj g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = v_object; -#line 8607 "LibraryMonitor.c" +#line 8608 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 8611 "LibraryMonitor.c" +#line 8612 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (old) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_job_unref (old); -#line 8617 "LibraryMonitor.c" +#line 8618 "LibraryMonitor.c" } } @@ -8625,14 +8626,14 @@ static void library_monitor_verify_job_class_init (LibraryMonitorVerifyJobClass library_monitor_verify_job_parent_class = g_type_class_peek_parent (klass); #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ((LibraryMonitorVerifyJobClass *) klass)->finalize = library_monitor_verify_job_finalize; -#line 8627 "LibraryMonitor.c" +#line 8628 "LibraryMonitor.c" } static void library_monitor_verify_job_instance_init (LibraryMonitorVerifyJob * self) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->ref_count = 1; -#line 8634 "LibraryMonitor.c" +#line 8635 "LibraryMonitor.c" } @@ -8646,7 +8647,7 @@ static void library_monitor_verify_job_finalize (LibraryMonitorVerifyJob* obj) { _g_object_unref0 (self->monitorable); #line 198 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->monitor); -#line 8648 "LibraryMonitor.c" +#line 8649 "LibraryMonitor.c" } @@ -8671,7 +8672,7 @@ static gpointer library_monitor_verify_job_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return instance; -#line 8673 "LibraryMonitor.c" +#line 8674 "LibraryMonitor.c" } @@ -8684,7 +8685,7 @@ static void library_monitor_verify_job_unref (gpointer instance) { LIBRARY_MONITOR_VERIFY_JOB_GET_CLASS (self)->finalize (self); #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8686 "LibraryMonitor.c" +#line 8687 "LibraryMonitor.c" } } @@ -8697,25 +8698,25 @@ static void library_monitor_class_init (LibraryMonitorClass * klass) { #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_type_class_add_private (klass, sizeof (LibraryMonitorPrivate)); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->close = library_monitor_real_close; + ((DirectoryMonitorClass *) klass)->close = (void (*)(DirectoryMonitor*)) library_monitor_real_close; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->discovery_started = library_monitor_real_discovery_started; + ((DirectoryMonitorClass *) klass)->discovery_started = (void (*)(DirectoryMonitor*)) library_monitor_real_discovery_started; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->file_discovered = library_monitor_real_file_discovered; + ((DirectoryMonitorClass *) klass)->file_discovered = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) library_monitor_real_file_discovered; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->discovery_completed = library_monitor_real_discovery_completed; + ((DirectoryMonitorClass *) klass)->discovery_completed = (void (*)(DirectoryMonitor*)) library_monitor_real_discovery_completed; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_created = library_monitor_real_notify_file_created; + ((DirectoryMonitorClass *) klass)->notify_file_created = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) library_monitor_real_notify_file_created; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_moved = library_monitor_real_notify_file_moved; + ((DirectoryMonitorClass *) klass)->notify_file_moved = (void (*)(DirectoryMonitor*, GFile*, GFile*, GFileInfo*)) library_monitor_real_notify_file_moved; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_altered = library_monitor_real_notify_file_altered; + ((DirectoryMonitorClass *) klass)->notify_file_altered = (void (*)(DirectoryMonitor*, GFile*)) library_monitor_real_notify_file_altered; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_attributes_altered = library_monitor_real_notify_file_attributes_altered; + ((DirectoryMonitorClass *) klass)->notify_file_attributes_altered = (void (*)(DirectoryMonitor*, GFile*)) library_monitor_real_notify_file_attributes_altered; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_alteration_completed = library_monitor_real_notify_file_alteration_completed; + ((DirectoryMonitorClass *) klass)->notify_file_alteration_completed = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) library_monitor_real_notify_file_alteration_completed; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_deleted = library_monitor_real_notify_file_deleted; + ((DirectoryMonitorClass *) klass)->notify_file_deleted = (void (*)(DirectoryMonitor*, GFile*)) library_monitor_real_notify_file_deleted; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" G_OBJECT_CLASS (klass)->finalize = library_monitor_finalize; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8727,14 +8728,14 @@ static void library_monitor_class_init (LibraryMonitorClass * klass) { #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_init (&__lock_library_monitor_blacklist); #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = 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); + _tmp0_ = 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 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_blacklist = _tmp0_; #line 207 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = hash_timed_queue_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, (guint) LIBRARY_MONITOR_MIN_BLACKLIST_DURATION_MSEC, _library_monitor_on_unblacklist_file_dequeued_callback, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, G_PRIORITY_LOW); + _tmp1_ = hash_timed_queue_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, (guint) LIBRARY_MONITOR_MIN_BLACKLIST_DURATION_MSEC, _library_monitor_on_unblacklist_file_dequeued_callback, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, G_PRIORITY_LOW); #line 207 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_to_unblacklist = _tmp1_; -#line 8736 "LibraryMonitor.c" +#line 8737 "LibraryMonitor.c" } @@ -8764,21 +8765,21 @@ static void library_monitor_instance_init (LibraryMonitor * self) { #line 213 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->unknown_files = NULL; #line 214 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = gee_array_list_new (TYPE_MEDIA_MONITOR, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp3_ = gee_array_list_new (TYPE_MEDIA_MONITOR, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 214 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->monitors = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_LIST, GeeList); #line 215 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->discovered = NULL; #line 216 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = 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); + _tmp4_ = 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 216 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->import_queue = _tmp4_; #line 217 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = 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); + _tmp5_ = 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 217 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->pending_imports = _tmp5_; #line 218 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = gee_array_list_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp6_ = gee_array_list_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 218 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->batch_import_queue = _tmp6_; #line 219 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8794,7 +8795,7 @@ static void library_monitor_instance_init (LibraryMonitor * self) { #line 224 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->import_queue_timer_id = (guint) 0; #line 225 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = gee_linked_list_new (LIBRARY_MONITOR_TYPE_VERIFY_JOB, (GBoxedCopyFunc) library_monitor_verify_job_ref, library_monitor_verify_job_unref, NULL, NULL, NULL); + _tmp7_ = gee_linked_list_new (LIBRARY_MONITOR_TYPE_VERIFY_JOB, (GBoxedCopyFunc) library_monitor_verify_job_ref, (GDestroyNotify) library_monitor_verify_job_unref, NULL, NULL, NULL); #line 225 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->verify_queue = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_QUEUE, GeeQueue); #line 226 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8803,7 +8804,7 @@ static void library_monitor_instance_init (LibraryMonitor * self) { self->priv->completed_monitorable_verifies = 0; #line 228 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->total_monitorable_verifies = 0; -#line 8805 "LibraryMonitor.c" +#line 8806 "LibraryMonitor.c" } @@ -8848,7 +8849,7 @@ static void library_monitor_finalize (GObject* obj) { _g_object_unref0 (self->priv->verify_queue); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" G_OBJECT_CLASS (library_monitor_parent_class)->finalize (obj); -#line 8850 "LibraryMonitor.c" +#line 8851 "LibraryMonitor.c" } |