diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:53:12 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:53:12 +0200 |
| commit | dfdb61e578cccb4b7ec2e9ccfa16a66ec481fab5 (patch) | |
| tree | dee893916166ac1c8b479b74e7f341429945260e /src/DirectoryMonitor.c | |
| parent | a5ea701acc282ade4ccb9b08a8613a8d66ca82a5 (diff) | |
| parent | 9e7cd144725a270e0460b21747619f447ca87684 (diff) | |
Merge tag 'upstream/0.26.1'
Upstream version 0.26.1
Diffstat (limited to 'src/DirectoryMonitor.c')
| -rw-r--r-- | src/DirectoryMonitor.c | 812 |
1 files changed, 407 insertions, 405 deletions
diff --git a/src/DirectoryMonitor.c b/src/DirectoryMonitor.c index 2762dfe..6467ece 100644 --- a/src/DirectoryMonitor.c +++ b/src/DirectoryMonitor.c @@ -1,4 +1,4 @@ -/* DirectoryMonitor.c generated by valac 0.34.4, the Vala compiler +/* DirectoryMonitor.c generated by valac 0.34.7, the Vala compiler * generated from DirectoryMonitor.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2099,13 +2099,13 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire #line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp0_ = NULL; #line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); + _data_->_tmp0_ = 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 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->file_children = _data_->_tmp0_; #line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp1_ = NULL; #line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); + _data_->_tmp1_ = 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 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->dir_children = _data_->_tmp1_; #line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2155,7 +2155,7 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire #line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp11_ = 0; #line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp10_, GEE_TYPE_COLLECTION, GeeCollection)); + _data_->_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp12_ = 0; #line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2323,7 +2323,7 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire #line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp38_ = 0; #line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp38_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp37_, GEE_TYPE_COLLECTION, GeeCollection)); + _data_->_tmp38_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp39_ = 0; #line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2948,13 +2948,13 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo #line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp0_ = NULL; #line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); + _data_->_tmp0_ = 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 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->file_children = _data_->_tmp0_; #line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp1_ = NULL; #line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); + _data_->_tmp1_ = 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 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->dir_children = _data_->_tmp1_; #line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3004,7 +3004,7 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo #line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp11_ = 0; #line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp10_, GEE_TYPE_COLLECTION, GeeCollection)); + _data_->_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp12_ = 0; #line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3089,7 +3089,7 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo #line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp23_ = 0; #line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp23_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp22_, GEE_TYPE_COLLECTION, GeeCollection)); + _data_->_tmp23_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp24_ = 0; #line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3411,7 +3411,7 @@ static void directory_monitor_real_close (DirectoryMonitor* self) { #line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = self->priv->monitors; #line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp2_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MAP, GeeMap)); + _tmp2_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = _tmp2_; #line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4250,7 +4250,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp72_ = NULL; #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp72_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_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, NULL, NULL, NULL); + _data_->_tmp72_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_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, NULL, NULL, NULL); #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_map); #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4306,7 +4306,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp81_ = NULL; #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp81_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_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, NULL, NULL, NULL); + _data_->_tmp81_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_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, NULL, NULL, NULL); #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_map); #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4544,7 +4544,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync #line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp109_ = NULL; #line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp109_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp108_, GEE_TYPE_MAP, GeeMap)); + _data_->_tmp109_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp108_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp110_ = NULL; #line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4977,15 +4977,15 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di const gchar* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; GFileMonitor* monitor = NULL; - GeeHashMap* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - GFileMonitor* _tmp20_ = NULL; + GeeHashMap* _tmp19_ = NULL; + const gchar* _tmp20_ = NULL; GFileMonitor* _tmp21_ = NULL; - GFile* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; + GFileMonitor* _tmp22_ = NULL; + GFile* _tmp23_ = NULL; gchar* _tmp24_ = NULL; gchar* _tmp25_ = NULL; gchar* _tmp26_ = NULL; + gchar* _tmp27_ = NULL; GError * _inner_error_ = NULL; #line 1008 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); @@ -5114,6 +5114,8 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di __finally482: #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 5114 "DirectoryMonitor.c" + gboolean _tmp18_ = FALSE; #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (monitor); #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5123,37 +5125,37 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_clear_error (&_inner_error_); #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - return FALSE; -#line 5124 "DirectoryMonitor.c" + return _tmp18_; +#line 5126 "DirectoryMonitor.c" } #line 1029 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp18_ = self->priv->monitors; + _tmp19_ = self->priv->monitors; #line 1029 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp19_ = id; + _tmp20_ = id; #line 1029 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp20_ = monitor; + _tmp21_ = monitor; #line 1029 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_, _tmp20_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_, _tmp21_); #line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp21_ = monitor; + _tmp22_ = monitor; #line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_connect_object (_tmp21_, "changed", (GCallback) _directory_monitor_on_monitor_notification_g_file_monitor_changed, self, 0); + g_signal_connect_object (_tmp22_, "changed", (GCallback) _directory_monitor_on_monitor_notification_g_file_monitor_changed, self, 0); #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp22_ = dir; + _tmp23_ = dir; #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp23_ = g_file_get_path (_tmp22_); + _tmp24_ = g_file_get_path (_tmp23_); #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp24_ = _tmp23_; + _tmp25_ = _tmp24_; #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp25_ = g_strdup_printf ("Added monitor for %s", _tmp24_); + _tmp26_ = g_strdup_printf ("Added monitor for %s", _tmp25_); #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp26_ = _tmp25_; + _tmp27_ = _tmp26_; #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_mdbg (_tmp26_); + directory_monitor_mdbg (_tmp27_); #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp27_); #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_tmp24_); + _g_free0 (_tmp25_); #line 1034 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = TRUE; #line 1034 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5162,7 +5164,7 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di _g_free0 (id); #line 1034 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5162 "DirectoryMonitor.c" +#line 5164 "DirectoryMonitor.c" } @@ -5205,7 +5207,7 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile* result = FALSE; #line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5205 "DirectoryMonitor.c" +#line 5207 "DirectoryMonitor.c" } #line 1042 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = self->priv->files; @@ -5227,7 +5229,7 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile* _g_free0 (id); #line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5227 "DirectoryMonitor.c" +#line 5229 "DirectoryMonitor.c" } #line 1046 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = self->priv->monitors; @@ -5249,7 +5251,7 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile* _g_free0 (id); #line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5249 "DirectoryMonitor.c" +#line 5251 "DirectoryMonitor.c" } #line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = self->priv->monitors; @@ -5291,7 +5293,7 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile* _g_free0 (id); #line 1057 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5291 "DirectoryMonitor.c" +#line 5293 "DirectoryMonitor.c" } @@ -5313,7 +5315,7 @@ static void directory_monitor_cancel_monitor (DirectoryMonitor* self, GFileMonit _tmp2_ = monitor; #line 1062 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_file_monitor_cancel (_tmp2_); -#line 5313 "DirectoryMonitor.c" +#line 5315 "DirectoryMonitor.c" } @@ -5322,7 +5324,7 @@ static void _directory_monitor_query_info_queue_element_on_completed_gasync_read directory_monitor_query_info_queue_element_on_completed ((DirectoryMonitorQueryInfoQueueElement*) self, source_object, res); #line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_unref (self); -#line 5322 "DirectoryMonitor.c" +#line 5324 "DirectoryMonitor.c" } @@ -5331,7 +5333,7 @@ static gboolean _directory_monitor_check_for_expired_delete_events_gsource_func result = directory_monitor_check_for_expired_delete_events ((DirectoryMonitor*) self); #line 1091 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5331 "DirectoryMonitor.c" +#line 5333 "DirectoryMonitor.c" } @@ -5363,7 +5365,7 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G _tmp1_ = other_file; #line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp1_ != NULL) { -#line 5363 "DirectoryMonitor.c" +#line 5365 "DirectoryMonitor.c" GFile* _tmp2_ = NULL; gchar* _tmp3_ = NULL; #line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5374,7 +5376,7 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G _g_free0 (_tmp0_); #line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _tmp3_; -#line 5374 "DirectoryMonitor.c" +#line 5376 "DirectoryMonitor.c" } else { gchar* _tmp4_ = NULL; #line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5383,7 +5385,7 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G _g_free0 (_tmp0_); #line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _tmp4_; -#line 5383 "DirectoryMonitor.c" +#line 5385 "DirectoryMonitor.c" } #line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = event; @@ -5429,7 +5431,7 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G case G_FILE_MONITOR_EVENT_CREATED: #line 1079 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: -#line 5429 "DirectoryMonitor.c" +#line 5431 "DirectoryMonitor.c" { GFile* _tmp19_ = NULL; GCancellable* _tmp20_ = NULL; @@ -5444,39 +5446,39 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G g_file_query_info_async (_tmp19_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _tmp20_, _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback, directory_monitor_query_info_queue_element_ref (_tmp21_)); #line 1084 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5444 "DirectoryMonitor.c" +#line 5446 "DirectoryMonitor.c" } #line 1079 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_DELETED: -#line 5448 "DirectoryMonitor.c" +#line 5450 "DirectoryMonitor.c" { guint _tmp22_ = 0U; #line 1090 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp22_ = self->priv->delete_timer_id; #line 1090 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp22_ == ((guint) 0)) { -#line 5455 "DirectoryMonitor.c" +#line 5457 "DirectoryMonitor.c" guint _tmp23_ = 0U; #line 1091 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp23_ = g_timeout_add_full (G_PRIORITY_DEFAULT, DIRECTORY_MONITOR_DELETED_EXPIRATION_MSEC / 2, _directory_monitor_check_for_expired_delete_events_gsource_func, g_object_ref (self), g_object_unref); #line 1091 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->delete_timer_id = _tmp23_; -#line 5461 "DirectoryMonitor.c" +#line 5463 "DirectoryMonitor.c" } #line 1092 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5465 "DirectoryMonitor.c" +#line 5467 "DirectoryMonitor.c" } #line 1079 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_MOVED: -#line 5469 "DirectoryMonitor.c" +#line 5471 "DirectoryMonitor.c" { GFile* _tmp24_ = NULL; #line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp24_ = other_file; #line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp24_ != NULL) { -#line 5476 "DirectoryMonitor.c" +#line 5478 "DirectoryMonitor.c" GFile* _tmp25_ = NULL; GCancellable* _tmp26_ = NULL; DirectoryMonitorQueryInfoQueueElement* _tmp27_ = NULL; @@ -5488,7 +5490,7 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G _tmp27_ = query_info; #line 1098 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_file_query_info_async (_tmp25_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _tmp26_, _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback, directory_monitor_query_info_queue_element_ref (_tmp27_)); -#line 5488 "DirectoryMonitor.c" +#line 5490 "DirectoryMonitor.c" } else { GeeQueue* _tmp28_ = NULL; DirectoryMonitorQueryInfoQueueElement* _tmp29_ = NULL; @@ -5501,11 +5503,11 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G _tmp29_ = query_info; #line 1102 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection), _tmp29_); -#line 5500 "DirectoryMonitor.c" +#line 5502 "DirectoryMonitor.c" } #line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5504 "DirectoryMonitor.c" +#line 5506 "DirectoryMonitor.c" } default: { @@ -5521,14 +5523,14 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G directory_monitor_process_query_queue (self, _tmp31_); #line 1110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5520 "DirectoryMonitor.c" +#line 5522 "DirectoryMonitor.c" } } #line 1065 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (query_info); #line 1065 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp0_); -#line 5527 "DirectoryMonitor.c" +#line 5529 "DirectoryMonitor.c" } @@ -5544,7 +5546,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp2_ = query_info; #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp2_ != NULL) { -#line 5543 "DirectoryMonitor.c" +#line 5545 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* _tmp3_ = NULL; GFileInfo* _tmp4_ = NULL; #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5553,15 +5555,15 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp4_ = _tmp3_->info; #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = _tmp4_ != NULL; -#line 5552 "DirectoryMonitor.c" +#line 5554 "DirectoryMonitor.c" } else { #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = FALSE; -#line 5556 "DirectoryMonitor.c" +#line 5558 "DirectoryMonitor.c" } #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp1_) { -#line 5560 "DirectoryMonitor.c" +#line 5562 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* _tmp5_ = NULL; GFileMonitorEvent _tmp6_ = 0; #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5570,15 +5572,15 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp6_ = _tmp5_->event; #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _tmp6_ == G_FILE_MONITOR_EVENT_CREATED; -#line 5569 "DirectoryMonitor.c" +#line 5571 "DirectoryMonitor.c" } else { #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = FALSE; -#line 5573 "DirectoryMonitor.c" +#line 5575 "DirectoryMonitor.c" } #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp0_) { -#line 5577 "DirectoryMonitor.c" +#line 5579 "DirectoryMonitor.c" GFile* match = NULL; DirectoryMonitorFileInfoMap* _tmp7_ = NULL; DirectoryMonitorQueryInfoQueueElement* _tmp8_ = NULL; @@ -5599,12 +5601,12 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp11_ = match; #line 1121 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp11_ != NULL) { -#line 5598 "DirectoryMonitor.c" +#line 5600 "DirectoryMonitor.c" gboolean matched = FALSE; gboolean _tmp48_ = FALSE; #line 1122 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" matched = FALSE; -#line 5603 "DirectoryMonitor.c" +#line 5605 "DirectoryMonitor.c" { GeeIterator* _enqueued_it = NULL; GeeQueue* _tmp12_ = NULL; @@ -5617,7 +5619,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _enqueued_it = _tmp13_; #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 5616 "DirectoryMonitor.c" +#line 5618 "DirectoryMonitor.c" GeeIterator* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; DirectoryMonitorQueryInfoQueueElement* enqueued = NULL; @@ -5655,7 +5657,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc if (!_tmp15_) { #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5654 "DirectoryMonitor.c" +#line 5656 "DirectoryMonitor.c" } #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp16_ = _enqueued_it; @@ -5671,7 +5673,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc if (_tmp21_ != G_FILE_MONITOR_EVENT_DELETED) { #line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = TRUE; -#line 5670 "DirectoryMonitor.c" +#line 5672 "DirectoryMonitor.c" } else { DirectoryMonitorQueryInfoQueueElement* _tmp22_ = NULL; gboolean _tmp23_ = FALSE; @@ -5681,13 +5683,13 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp23_ = _tmp22_->completed; #line 1125 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = _tmp23_; -#line 5680 "DirectoryMonitor.c" +#line 5682 "DirectoryMonitor.c" } #line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp19_) { #line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = TRUE; -#line 5686 "DirectoryMonitor.c" +#line 5688 "DirectoryMonitor.c" } else { GFile* _tmp24_ = NULL; DirectoryMonitorQueryInfoQueueElement* _tmp25_ = NULL; @@ -5703,7 +5705,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp27_ = g_file_equal (_tmp24_, _tmp26_); #line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = !_tmp27_; -#line 5702 "DirectoryMonitor.c" +#line 5704 "DirectoryMonitor.c" } #line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp18_) { @@ -5711,7 +5713,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _directory_monitor_query_info_queue_element_unref0 (enqueued); #line 1127 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 5710 "DirectoryMonitor.c" +#line 5712 "DirectoryMonitor.c" } #line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp28_ = query_info; @@ -5779,17 +5781,17 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _directory_monitor_query_info_queue_element_unref0 (enqueued); #line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5778 "DirectoryMonitor.c" +#line 5780 "DirectoryMonitor.c" } #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_enqueued_it); -#line 5782 "DirectoryMonitor.c" +#line 5784 "DirectoryMonitor.c" } #line 1143 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp48_ = matched; #line 1143 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp48_) { -#line 5788 "DirectoryMonitor.c" +#line 5790 "DirectoryMonitor.c" GeeQueue* _tmp49_ = NULL; DirectoryMonitorQueryInfoQueueElement* _tmp50_ = NULL; #line 1144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5798,12 +5800,12 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp50_ = query_info; #line 1144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection), _tmp50_); -#line 5797 "DirectoryMonitor.c" +#line 5799 "DirectoryMonitor.c" } } #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (match); -#line 5802 "DirectoryMonitor.c" +#line 5804 "DirectoryMonitor.c" } { gboolean _tmp51_ = FALSE; @@ -5811,7 +5813,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp51_ = TRUE; #line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 5810 "DirectoryMonitor.c" +#line 5812 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* next = NULL; GeeQueue* _tmp52_ = NULL; gpointer _tmp53_ = NULL; @@ -5851,7 +5853,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc GFileMonitorEvent _tmp125_ = 0; #line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp51_) { -#line 5850 "DirectoryMonitor.c" +#line 5852 "DirectoryMonitor.c" } #line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp51_ = FALSE; @@ -5867,7 +5869,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc if (_tmp55_ == NULL) { #line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp54_ = TRUE; -#line 5866 "DirectoryMonitor.c" +#line 5868 "DirectoryMonitor.c" } else { DirectoryMonitorQueryInfoQueueElement* _tmp56_ = NULL; gboolean _tmp57_ = FALSE; @@ -5877,7 +5879,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp57_ = _tmp56_->completed; #line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp54_ = !_tmp57_; -#line 5876 "DirectoryMonitor.c" +#line 5878 "DirectoryMonitor.c" } #line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp54_) { @@ -5885,7 +5887,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _directory_monitor_query_info_queue_element_unref0 (next); #line 1153 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5884 "DirectoryMonitor.c" +#line 5886 "DirectoryMonitor.c" } #line 1156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp58_ = self->priv->query_info_queue; @@ -5933,7 +5935,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp74_ = _tmp73_->err; #line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp74_ != NULL) { -#line 5932 "DirectoryMonitor.c" +#line 5934 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* _tmp75_ = NULL; GFile* _tmp76_ = NULL; gchar* _tmp77_ = NULL; @@ -5982,7 +5984,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _directory_monitor_query_info_queue_element_unref0 (next); #line 1166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 5981 "DirectoryMonitor.c" +#line 5983 "DirectoryMonitor.c" } #line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp88_ = next; @@ -5990,7 +5992,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp89_ = _tmp88_->info; #line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp89_ != NULL) { -#line 5989 "DirectoryMonitor.c" +#line 5991 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* _tmp90_ = NULL; GFileInfo* _tmp91_ = NULL; gchar* _tmp92_ = NULL; @@ -6007,15 +6009,15 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp87_ = _tmp93_ == NULL; #line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp93_); -#line 6006 "DirectoryMonitor.c" +#line 6008 "DirectoryMonitor.c" } else { #line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp87_ = FALSE; -#line 6010 "DirectoryMonitor.c" +#line 6012 "DirectoryMonitor.c" } #line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp87_) { -#line 6014 "DirectoryMonitor.c" +#line 6016 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* _tmp94_ = NULL; GFile* _tmp95_ = NULL; gchar* _tmp96_ = NULL; @@ -6055,7 +6057,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _directory_monitor_query_info_queue_element_unref0 (next); #line 1174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 6054 "DirectoryMonitor.c" +#line 6056 "DirectoryMonitor.c" } #line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp104_ = next; @@ -6063,7 +6065,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp105_ = _tmp104_->info; #line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp105_ != NULL) { -#line 6062 "DirectoryMonitor.c" +#line 6064 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* _tmp106_ = NULL; GFileInfo* _tmp107_ = NULL; gboolean _tmp108_ = FALSE; @@ -6075,15 +6077,15 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp108_ = directory_monitor_is_file_symlink_supported (_tmp107_); #line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp103_ = !_tmp108_; -#line 6074 "DirectoryMonitor.c" +#line 6076 "DirectoryMonitor.c" } else { #line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp103_ = FALSE; -#line 6078 "DirectoryMonitor.c" +#line 6080 "DirectoryMonitor.c" } #line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp103_) { -#line 6082 "DirectoryMonitor.c" +#line 6084 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* _tmp109_ = NULL; GFile* _tmp110_ = NULL; gchar* _tmp111_ = NULL; @@ -6123,7 +6125,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _directory_monitor_query_info_queue_element_unref0 (next); #line 1182 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 6122 "DirectoryMonitor.c" +#line 6124 "DirectoryMonitor.c" } #line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp118_ = next; @@ -6147,7 +6149,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _directory_monitor_query_info_queue_element_unref0 (n); #line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (next); -#line 6146 "DirectoryMonitor.c" +#line 6148 "DirectoryMonitor.c" } } } @@ -6176,7 +6178,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _tmp1_ = other_file; #line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp1_ != NULL) { -#line 6175 "DirectoryMonitor.c" +#line 6177 "DirectoryMonitor.c" GFile* _tmp2_ = NULL; gchar* _tmp3_ = NULL; #line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6187,7 +6189,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _g_free0 (_tmp0_); #line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _tmp3_; -#line 6186 "DirectoryMonitor.c" +#line 6188 "DirectoryMonitor.c" } else { gchar* _tmp4_ = NULL; #line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6196,7 +6198,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _g_free0 (_tmp0_); #line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _tmp4_; -#line 6195 "DirectoryMonitor.c" +#line 6197 "DirectoryMonitor.c" } #line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = event; @@ -6224,7 +6226,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s switch (_tmp12_) { #line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_CREATED: -#line 6223 "DirectoryMonitor.c" +#line 6225 "DirectoryMonitor.c" { GFileInfo* _tmp13_ = NULL; DirectoryMonitorFType ftype = 0; @@ -6247,7 +6249,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s switch (_tmp16_) { #line 1201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6246 "DirectoryMonitor.c" +#line 6248 "DirectoryMonitor.c" { GFile* _tmp17_ = NULL; GFileInfo* _tmp18_ = NULL; @@ -6259,11 +6261,11 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s directory_monitor_internal_notify_file_created (self, _tmp17_, _tmp18_); #line 1204 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6258 "DirectoryMonitor.c" +#line 6260 "DirectoryMonitor.c" } #line 1201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6262 "DirectoryMonitor.c" +#line 6264 "DirectoryMonitor.c" { gint _tmp19_ = 0; GFile* _tmp20_ = NULL; @@ -6280,7 +6282,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s directory_monitor_explore_async (self, _tmp20_, _tmp21_, FALSE, NULL, NULL); #line 1213 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6279 "DirectoryMonitor.c" +#line 6281 "DirectoryMonitor.c" } default: { @@ -6291,16 +6293,16 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _vala_assert (_tmp22_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6290 "DirectoryMonitor.c" +#line 6292 "DirectoryMonitor.c" } } #line 1219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6295 "DirectoryMonitor.c" +#line 6297 "DirectoryMonitor.c" } #line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_CHANGED: -#line 6299 "DirectoryMonitor.c" +#line 6301 "DirectoryMonitor.c" { GFileInfo* _tmp23_ = NULL; GFileInfo* local_info = NULL; @@ -6325,7 +6327,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _tmp26_ = local_info; #line 1226 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp26_ == NULL) { -#line 6324 "DirectoryMonitor.c" +#line 6326 "DirectoryMonitor.c" GFile* _tmp27_ = NULL; gchar* _tmp28_ = NULL; gchar* _tmp29_ = NULL; @@ -6351,7 +6353,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _g_object_unref0 (local_info); #line 1229 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6350 "DirectoryMonitor.c" +#line 6352 "DirectoryMonitor.c" } #line 1232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp32_ = local_info; @@ -6365,7 +6367,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s switch (_tmp34_) { #line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6364 "DirectoryMonitor.c" +#line 6366 "DirectoryMonitor.c" { GFile* _tmp35_ = NULL; #line 1235 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6374,11 +6376,11 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s directory_monitor_notify_file_altered (self, _tmp35_); #line 1236 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6373 "DirectoryMonitor.c" +#line 6375 "DirectoryMonitor.c" } #line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6377 "DirectoryMonitor.c" +#line 6379 "DirectoryMonitor.c" { GFile* _tmp36_ = NULL; #line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6387,7 +6389,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s directory_monitor_notify_directory_altered (self, _tmp36_); #line 1240 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6386 "DirectoryMonitor.c" +#line 6388 "DirectoryMonitor.c" } default: { @@ -6398,18 +6400,18 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _vala_assert (_tmp37_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1244 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6397 "DirectoryMonitor.c" +#line 6399 "DirectoryMonitor.c" } } #line 1246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); #line 1246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6404 "DirectoryMonitor.c" +#line 6406 "DirectoryMonitor.c" } #line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: -#line 6408 "DirectoryMonitor.c" +#line 6410 "DirectoryMonitor.c" { GFileInfo* _tmp38_ = NULL; DirectoryMonitorFType ftype = 0; @@ -6432,7 +6434,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s switch (_tmp41_) { #line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6431 "DirectoryMonitor.c" +#line 6433 "DirectoryMonitor.c" { GFile* _tmp42_ = NULL; GFileInfo* _tmp43_ = NULL; @@ -6444,11 +6446,11 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s directory_monitor_internal_notify_file_alteration_completed (self, _tmp42_, _tmp43_); #line 1255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6443 "DirectoryMonitor.c" +#line 6445 "DirectoryMonitor.c" } #line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6447 "DirectoryMonitor.c" +#line 6449 "DirectoryMonitor.c" { GFile* _tmp44_ = NULL; GFileInfo* _tmp45_ = NULL; @@ -6460,7 +6462,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s directory_monitor_internal_notify_directory_alteration_completed (self, _tmp44_, _tmp45_); #line 1259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6459 "DirectoryMonitor.c" +#line 6461 "DirectoryMonitor.c" } default: { @@ -6471,16 +6473,16 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _vala_assert (_tmp46_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6470 "DirectoryMonitor.c" +#line 6472 "DirectoryMonitor.c" } } #line 1265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6475 "DirectoryMonitor.c" +#line 6477 "DirectoryMonitor.c" } #line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_MOVED: -#line 6479 "DirectoryMonitor.c" +#line 6481 "DirectoryMonitor.c" { GFileInfo* _tmp47_ = NULL; GFile* _tmp48_ = NULL; @@ -6508,7 +6510,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s switch (_tmp51_) { #line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6507 "DirectoryMonitor.c" +#line 6509 "DirectoryMonitor.c" { GFile* _tmp52_ = NULL; GFile* _tmp53_ = NULL; @@ -6523,11 +6525,11 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s directory_monitor_internal_notify_file_moved (self, _tmp52_, _tmp53_, _tmp54_); #line 1277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6522 "DirectoryMonitor.c" +#line 6524 "DirectoryMonitor.c" } #line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6526 "DirectoryMonitor.c" +#line 6528 "DirectoryMonitor.c" { GFileInfo* old_dir_info = NULL; DirectoryMonitorFileInfoMap* _tmp55_ = NULL; @@ -6550,7 +6552,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _tmp58_ = old_dir_info; #line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp58_ == NULL) { -#line 6549 "DirectoryMonitor.c" +#line 6551 "DirectoryMonitor.c" GFile* _tmp59_ = NULL; gchar* _tmp60_ = NULL; gchar* _tmp61_ = NULL; @@ -6568,7 +6570,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _g_object_unref0 (old_dir_info); #line 1285 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6567 "DirectoryMonitor.c" +#line 6569 "DirectoryMonitor.c" } #line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp62_ = file; @@ -6584,7 +6586,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _g_object_unref0 (old_dir_info); #line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6583 "DirectoryMonitor.c" +#line 6585 "DirectoryMonitor.c" } default: { @@ -6595,16 +6597,16 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _vala_assert (_tmp66_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6594 "DirectoryMonitor.c" +#line 6596 "DirectoryMonitor.c" } } #line 1295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6599 "DirectoryMonitor.c" +#line 6601 "DirectoryMonitor.c" } #line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_DELETED: -#line 6603 "DirectoryMonitor.c" +#line 6605 "DirectoryMonitor.c" { GFileInfo* _tmp67_ = NULL; GFileInfo* local_info = NULL; @@ -6629,7 +6631,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _tmp70_ = local_info; #line 1301 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp70_ == NULL) { -#line 6628 "DirectoryMonitor.c" +#line 6630 "DirectoryMonitor.c" GFile* _tmp71_ = NULL; gchar* _tmp72_ = NULL; gchar* _tmp73_ = NULL; @@ -6647,7 +6649,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _g_object_unref0 (local_info); #line 1304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6646 "DirectoryMonitor.c" +#line 6648 "DirectoryMonitor.c" } #line 1307 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp74_ = local_info; @@ -6661,7 +6663,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s switch (_tmp76_) { #line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6660 "DirectoryMonitor.c" +#line 6662 "DirectoryMonitor.c" { GFile* _tmp77_ = NULL; #line 1310 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6670,11 +6672,11 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s directory_monitor_internal_notify_file_deleted (self, _tmp77_); #line 1311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6669 "DirectoryMonitor.c" +#line 6671 "DirectoryMonitor.c" } #line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6673 "DirectoryMonitor.c" +#line 6675 "DirectoryMonitor.c" { GFile* _tmp78_ = NULL; #line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6683,7 +6685,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s directory_monitor_internal_notify_directory_deleted (self, _tmp78_); #line 1315 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6682 "DirectoryMonitor.c" +#line 6684 "DirectoryMonitor.c" } default: { @@ -6694,18 +6696,18 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _vala_assert (_tmp79_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6693 "DirectoryMonitor.c" +#line 6695 "DirectoryMonitor.c" } } #line 1321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); #line 1321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6700 "DirectoryMonitor.c" +#line 6702 "DirectoryMonitor.c" } #line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: -#line 6704 "DirectoryMonitor.c" +#line 6706 "DirectoryMonitor.c" { GFileInfo* _tmp80_ = NULL; GFileInfo* local_info = NULL; @@ -6730,7 +6732,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _tmp83_ = local_info; #line 1328 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp83_ == NULL) { -#line 6729 "DirectoryMonitor.c" +#line 6731 "DirectoryMonitor.c" GFile* _tmp84_ = NULL; gchar* _tmp85_ = NULL; gchar* _tmp86_ = NULL; @@ -6749,7 +6751,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _g_object_unref0 (local_info); #line 1331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6747 "DirectoryMonitor.c" +#line 6749 "DirectoryMonitor.c" } #line 1334 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp87_ = local_info; @@ -6763,7 +6765,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s switch (_tmp89_) { #line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6761 "DirectoryMonitor.c" +#line 6763 "DirectoryMonitor.c" { GFile* _tmp90_ = NULL; #line 1337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6772,11 +6774,11 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s directory_monitor_notify_file_attributes_altered (self, _tmp90_); #line 1338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6770 "DirectoryMonitor.c" +#line 6772 "DirectoryMonitor.c" } #line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6774 "DirectoryMonitor.c" +#line 6776 "DirectoryMonitor.c" { GFile* _tmp91_ = NULL; #line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6785,7 +6787,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s directory_monitor_notify_directory_attributes_altered (self, _tmp91_); #line 1342 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6783 "DirectoryMonitor.c" +#line 6785 "DirectoryMonitor.c" } default: { @@ -6796,24 +6798,24 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _vala_assert (_tmp92_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6794 "DirectoryMonitor.c" +#line 6796 "DirectoryMonitor.c" } } #line 1348 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); #line 1348 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6801 "DirectoryMonitor.c" +#line 6803 "DirectoryMonitor.c" } #line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_PRE_UNMOUNT: #line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_UNMOUNTED: -#line 6807 "DirectoryMonitor.c" +#line 6809 "DirectoryMonitor.c" { #line 1353 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6811 "DirectoryMonitor.c" +#line 6813 "DirectoryMonitor.c" } default: { @@ -6827,12 +6829,12 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s g_warning ("DirectoryMonitor.vala:1356: Unknown directory monitor event %s", (_tmp94_ != NULL) ? _tmp94_->value_name : NULL); #line 1357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6825 "DirectoryMonitor.c" +#line 6827 "DirectoryMonitor.c" } } #line 1189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp0_); -#line 6830 "DirectoryMonitor.c" +#line 6832 "DirectoryMonitor.c" } @@ -6863,7 +6865,7 @@ static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, G _tmp3_ = match; #line 1367 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp3_ != NULL) { -#line 6861 "DirectoryMonitor.c" +#line 6863 "DirectoryMonitor.c" GFile* _tmp4_ = NULL; GFile* _tmp5_ = NULL; DirectoryMonitorFileInfoMap* _tmp6_ = NULL; @@ -6906,25 +6908,25 @@ static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, G if (old_file) { #line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *old_file = _vala_old_file; -#line 6904 "DirectoryMonitor.c" +#line 6906 "DirectoryMonitor.c" } else { #line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file); -#line 6908 "DirectoryMonitor.c" +#line 6910 "DirectoryMonitor.c" } #line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old_file_info) { #line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *old_file_info = _vala_old_file_info; -#line 6914 "DirectoryMonitor.c" +#line 6916 "DirectoryMonitor.c" } else { #line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file_info); -#line 6918 "DirectoryMonitor.c" +#line 6920 "DirectoryMonitor.c" } #line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 6922 "DirectoryMonitor.c" +#line 6924 "DirectoryMonitor.c" } #line 1376 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file); @@ -6942,25 +6944,25 @@ static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, G if (old_file) { #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *old_file = _vala_old_file; -#line 6940 "DirectoryMonitor.c" +#line 6942 "DirectoryMonitor.c" } else { #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file); -#line 6944 "DirectoryMonitor.c" +#line 6946 "DirectoryMonitor.c" } #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old_file_info) { #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *old_file_info = _vala_old_file_info; -#line 6950 "DirectoryMonitor.c" +#line 6952 "DirectoryMonitor.c" } else { #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file_info); -#line 6954 "DirectoryMonitor.c" +#line 6956 "DirectoryMonitor.c" } #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 6958 "DirectoryMonitor.c" +#line 6960 "DirectoryMonitor.c" } @@ -6982,7 +6984,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni any_deleted = FALSE; #line 1386 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" any_expired = FALSE; -#line 6980 "DirectoryMonitor.c" +#line 6982 "DirectoryMonitor.c" { GeeIterator* _element_it = NULL; GeeQueue* _tmp1_ = NULL; @@ -6995,7 +6997,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni _element_it = _tmp2_; #line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 6993 "DirectoryMonitor.c" +#line 6995 "DirectoryMonitor.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; DirectoryMonitorQueryInfoQueueElement* element = NULL; @@ -7015,7 +7017,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni if (!_tmp4_) { #line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 7013 "DirectoryMonitor.c" +#line 7015 "DirectoryMonitor.c" } #line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = _element_it; @@ -7033,7 +7035,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni _directory_monitor_query_info_queue_element_unref0 (element); #line 1389 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 7031 "DirectoryMonitor.c" +#line 7033 "DirectoryMonitor.c" } #line 1391 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" any_deleted = TRUE; @@ -7049,7 +7051,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni _directory_monitor_query_info_queue_element_unref0 (element); #line 1394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 7047 "DirectoryMonitor.c" +#line 7049 "DirectoryMonitor.c" } #line 1397 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = element; @@ -7059,11 +7061,11 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni any_expired = TRUE; #line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (element); -#line 7057 "DirectoryMonitor.c" +#line 7059 "DirectoryMonitor.c" } #line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_element_it); -#line 7061 "DirectoryMonitor.c" +#line 7063 "DirectoryMonitor.c" } #line 1401 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = any_expired; @@ -7071,7 +7073,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni if (_tmp13_) { #line 1402 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_process_query_queue (self, NULL); -#line 7069 "DirectoryMonitor.c" +#line 7071 "DirectoryMonitor.c" } #line 1404 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = any_deleted; @@ -7079,13 +7081,13 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni if (!_tmp14_) { #line 1405 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->delete_timer_id = (guint) 0; -#line 7077 "DirectoryMonitor.c" +#line 7079 "DirectoryMonitor.c" } #line 1407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = any_deleted; #line 1407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7083 "DirectoryMonitor.c" +#line 7085 "DirectoryMonitor.c" } @@ -7108,7 +7110,7 @@ GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, GFile* file) result = _tmp2_; #line 1412 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7106 "DirectoryMonitor.c" +#line 7108 "DirectoryMonitor.c" } @@ -7126,7 +7128,7 @@ GeeCollection* directory_monitor_get_files (DirectoryMonitor* self) { result = _tmp1_; #line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7124 "DirectoryMonitor.c" +#line 7126 "DirectoryMonitor.c" } @@ -7152,7 +7154,7 @@ GFileInfo* directory_monitor_query_file_info (DirectoryMonitor* self, GFile* fil result = _tmp3_; #line 1425 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7150 "DirectoryMonitor.c" +#line 7152 "DirectoryMonitor.c" } @@ -7176,7 +7178,7 @@ gboolean directory_monitor_is_file_symlink_supported (GFileInfo* info) { result = TRUE; #line 1437 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7174 "DirectoryMonitor.c" +#line 7176 "DirectoryMonitor.c" } #line 1439 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = info; @@ -7190,23 +7192,23 @@ gboolean directory_monitor_is_file_symlink_supported (GFileInfo* info) { switch (_tmp4_) { #line 1440 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 7188 "DirectoryMonitor.c" +#line 7190 "DirectoryMonitor.c" { #line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = DIRECTORY_MONITOR_SUPPORT_DIR_SYMLINKS; #line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7194 "DirectoryMonitor.c" +#line 7196 "DirectoryMonitor.c" } #line 1440 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 7198 "DirectoryMonitor.c" +#line 7200 "DirectoryMonitor.c" { #line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = DIRECTORY_MONITOR_SUPPORT_FILE_SYMLINKS; #line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7204 "DirectoryMonitor.c" +#line 7206 "DirectoryMonitor.c" } default: { @@ -7219,7 +7221,7 @@ gboolean directory_monitor_is_file_symlink_supported (GFileInfo* info) { result = FALSE; #line 1450 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7217 "DirectoryMonitor.c" +#line 7219 "DirectoryMonitor.c" } } } @@ -7232,7 +7234,7 @@ static void directory_monitor_real_root_moved (DirectoryMonitor* self, GFile* ol g_return_if_fail (G_IS_FILE (new_root)); #line 380 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_root_info)); -#line 7230 "DirectoryMonitor.c" +#line 7232 "DirectoryMonitor.c" } @@ -7251,26 +7253,26 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closu data1 = closure->data; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data2 = param_values->data[0].v_pointer; -#line 7249 "DirectoryMonitor.c" +#line 7251 "DirectoryMonitor.c" } else { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data1 = param_values->data[0].v_pointer; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data2 = closure->data; -#line 7255 "DirectoryMonitor.c" +#line 7257 "DirectoryMonitor.c" } #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_object (param_values + 3), data2); -#line 7261 "DirectoryMonitor.c" +#line 7263 "DirectoryMonitor.c" } static void directory_monitor_real_root_deleted (DirectoryMonitor* self, GFile* root) { #line 388 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (root)); -#line 7268 "DirectoryMonitor.c" +#line 7270 "DirectoryMonitor.c" } @@ -7283,7 +7285,7 @@ static void directory_monitor_real_file_discovered (DirectoryMonitor* self, GFil g_return_if_fail (G_IS_FILE (file)); #line 394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7281 "DirectoryMonitor.c" +#line 7283 "DirectoryMonitor.c" } @@ -7302,19 +7304,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data2 = param_values->data[0].v_pointer; -#line 7300 "DirectoryMonitor.c" +#line 7302 "DirectoryMonitor.c" } else { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data1 = param_values->data[0].v_pointer; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data2 = closure->data; -#line 7306 "DirectoryMonitor.c" +#line 7308 "DirectoryMonitor.c" } #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 7312 "DirectoryMonitor.c" +#line 7314 "DirectoryMonitor.c" } @@ -7323,14 +7325,14 @@ static void directory_monitor_real_directory_discovered (DirectoryMonitor* self, g_return_if_fail (G_IS_FILE (file)); #line 397 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7321 "DirectoryMonitor.c" +#line 7323 "DirectoryMonitor.c" } static void directory_monitor_real_discovery_failed (DirectoryMonitor* self, const gchar* reason) { #line 402 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (reason != NULL); -#line 7328 "DirectoryMonitor.c" +#line 7330 "DirectoryMonitor.c" } @@ -7339,7 +7341,7 @@ static void directory_monitor_real_discovery_completed (DirectoryMonitor* self) self->priv->has_discovery_started = FALSE; #line 407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg ("discovery completed"); -#line 7337 "DirectoryMonitor.c" +#line 7339 "DirectoryMonitor.c" } @@ -7348,7 +7350,7 @@ static void directory_monitor_real_file_created (DirectoryMonitor* self, GFile* g_return_if_fail (G_IS_FILE (file)); #line 410 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7346 "DirectoryMonitor.c" +#line 7348 "DirectoryMonitor.c" } @@ -7359,14 +7361,14 @@ static void directory_monitor_real_file_moved (DirectoryMonitor* self, GFile* ol g_return_if_fail (G_IS_FILE (new_file)); #line 413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_file_info)); -#line 7357 "DirectoryMonitor.c" +#line 7359 "DirectoryMonitor.c" } static void directory_monitor_real_file_altered (DirectoryMonitor* self, GFile* file) { #line 417 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 7364 "DirectoryMonitor.c" +#line 7366 "DirectoryMonitor.c" } @@ -7375,21 +7377,21 @@ static void directory_monitor_real_file_alteration_completed (DirectoryMonitor* g_return_if_fail (G_IS_FILE (file)); #line 422 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7373 "DirectoryMonitor.c" +#line 7375 "DirectoryMonitor.c" } static void directory_monitor_real_file_attributes_altered (DirectoryMonitor* self, GFile* file) { #line 425 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 7380 "DirectoryMonitor.c" +#line 7382 "DirectoryMonitor.c" } static void directory_monitor_real_file_deleted (DirectoryMonitor* self, GFile* file) { #line 428 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 7387 "DirectoryMonitor.c" +#line 7389 "DirectoryMonitor.c" } @@ -7398,7 +7400,7 @@ static void directory_monitor_real_directory_created (DirectoryMonitor* self, GF g_return_if_fail (G_IS_FILE (dir)); #line 432 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7396 "DirectoryMonitor.c" +#line 7398 "DirectoryMonitor.c" } @@ -7409,14 +7411,14 @@ static void directory_monitor_real_directory_moved (DirectoryMonitor* self, GFil g_return_if_fail (G_IS_FILE (new_dir)); #line 436 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_dir_info)); -#line 7407 "DirectoryMonitor.c" +#line 7409 "DirectoryMonitor.c" } static void directory_monitor_real_directory_altered (DirectoryMonitor* self, GFile* dir) { #line 440 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 7414 "DirectoryMonitor.c" +#line 7416 "DirectoryMonitor.c" } @@ -7425,21 +7427,21 @@ static void directory_monitor_real_directory_alteration_completed (DirectoryMoni g_return_if_fail (G_IS_FILE (dir)); #line 445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7423 "DirectoryMonitor.c" +#line 7425 "DirectoryMonitor.c" } static void directory_monitor_real_directory_attributes_altered (DirectoryMonitor* self, GFile* dir) { #line 448 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 7430 "DirectoryMonitor.c" +#line 7432 "DirectoryMonitor.c" } static void directory_monitor_real_directory_deleted (DirectoryMonitor* self, GFile* dir) { #line 452 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 7437 "DirectoryMonitor.c" +#line 7439 "DirectoryMonitor.c" } @@ -7506,21 +7508,21 @@ static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue self->time_created_msec = _tmp8_; #line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return self; -#line 7504 "DirectoryMonitor.c" +#line 7506 "DirectoryMonitor.c" } static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue_element_new (DirectoryMonitor* owner, GFile* file, GFile* other_file, GFileMonitorEvent event) { #line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return directory_monitor_query_info_queue_element_construct (DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT, owner, file, other_file, event); -#line 7511 "DirectoryMonitor.c" +#line 7513 "DirectoryMonitor.c" } static gpointer _g_error_copy0 (gpointer self) { #line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return self ? g_error_copy (self) : NULL; -#line 7518 "DirectoryMonitor.c" +#line 7520 "DirectoryMonitor.c" } @@ -7542,7 +7544,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_file_get_type (), GFile)); #line 107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" source_file = _tmp1_; -#line 7540 "DirectoryMonitor.c" +#line 7542 "DirectoryMonitor.c" { GFileInfo* _tmp2_ = NULL; GAsyncResult* _tmp3_ = NULL; @@ -7556,7 +7558,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo _tmp2_ = _tmp4_; #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7554 "DirectoryMonitor.c" +#line 7556 "DirectoryMonitor.c" goto __catch483_g_error; } #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7569,7 +7571,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo self->info = _tmp5_; #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_tmp2_); -#line 7567 "DirectoryMonitor.c" +#line 7569 "DirectoryMonitor.c" } goto __finally483; __catch483_g_error: @@ -7591,7 +7593,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo self->err = _tmp7_; #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_error_free0 (err); -#line 7589 "DirectoryMonitor.c" +#line 7591 "DirectoryMonitor.c" } __finally483: #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7604,7 +7606,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo g_clear_error (&_inner_error_); #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return; -#line 7602 "DirectoryMonitor.c" +#line 7604 "DirectoryMonitor.c" } #line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->completed = TRUE; @@ -7614,14 +7616,14 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo directory_monitor_process_query_queue (_tmp8_, self); #line 106 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (source_file); -#line 7612 "DirectoryMonitor.c" +#line 7614 "DirectoryMonitor.c" } static void directory_monitor_value_query_info_queue_element_init (GValue* value) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 7619 "DirectoryMonitor.c" +#line 7621 "DirectoryMonitor.c" } @@ -7630,7 +7632,7 @@ static void directory_monitor_value_query_info_queue_element_free_value (GValue* if (value->data[0].v_pointer) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_unref (value->data[0].v_pointer); -#line 7628 "DirectoryMonitor.c" +#line 7630 "DirectoryMonitor.c" } } @@ -7640,11 +7642,11 @@ static void directory_monitor_value_query_info_queue_element_copy_value (const G if (src_value->data[0].v_pointer) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" dest_value->data[0].v_pointer = directory_monitor_query_info_queue_element_ref (src_value->data[0].v_pointer); -#line 7638 "DirectoryMonitor.c" +#line 7640 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 7642 "DirectoryMonitor.c" +#line 7644 "DirectoryMonitor.c" } } @@ -7652,37 +7654,37 @@ static void directory_monitor_value_query_info_queue_element_copy_value (const G static gpointer directory_monitor_value_query_info_queue_element_peek_pointer (const GValue* value) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return value->data[0].v_pointer; -#line 7650 "DirectoryMonitor.c" +#line 7652 "DirectoryMonitor.c" } static gchar* directory_monitor_value_query_info_queue_element_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (collect_values[0].v_pointer) { -#line 7657 "DirectoryMonitor.c" +#line 7659 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* object; object = collect_values[0].v_pointer; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (object->parent_instance.g_class == NULL) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 7664 "DirectoryMonitor.c" +#line 7666 "DirectoryMonitor.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.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 7668 "DirectoryMonitor.c" +#line 7670 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = directory_monitor_query_info_queue_element_ref (object); -#line 7672 "DirectoryMonitor.c" +#line 7674 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 7676 "DirectoryMonitor.c" +#line 7678 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 7680 "DirectoryMonitor.c" +#line 7682 "DirectoryMonitor.c" } @@ -7693,25 +7695,25 @@ static gchar* directory_monitor_value_query_info_queue_element_lcopy_value (cons if (!object_p) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 7691 "DirectoryMonitor.c" +#line 7693 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!value->data[0].v_pointer) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = NULL; -#line 7697 "DirectoryMonitor.c" +#line 7699 "DirectoryMonitor.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = value->data[0].v_pointer; -#line 7701 "DirectoryMonitor.c" +#line 7703 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = directory_monitor_query_info_queue_element_ref (value->data[0].v_pointer); -#line 7705 "DirectoryMonitor.c" +#line 7707 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 7709 "DirectoryMonitor.c" +#line 7711 "DirectoryMonitor.c" } @@ -7725,7 +7727,7 @@ static GParamSpec* directory_monitor_param_spec_query_info_queue_element (const G_PARAM_SPEC (spec)->value_type = object_type; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return G_PARAM_SPEC (spec); -#line 7723 "DirectoryMonitor.c" +#line 7725 "DirectoryMonitor.c" } @@ -7734,7 +7736,7 @@ static gpointer directory_monitor_value_get_query_info_queue_element (const GVal g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT), NULL); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return value->data[0].v_pointer; -#line 7732 "DirectoryMonitor.c" +#line 7734 "DirectoryMonitor.c" } @@ -7754,17 +7756,17 @@ static void directory_monitor_value_set_query_info_queue_element (GValue* value, value->data[0].v_pointer = v_object; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_ref (value->data[0].v_pointer); -#line 7752 "DirectoryMonitor.c" +#line 7754 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 7756 "DirectoryMonitor.c" +#line 7758 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_unref (old); -#line 7762 "DirectoryMonitor.c" +#line 7764 "DirectoryMonitor.c" } } @@ -7783,17 +7785,17 @@ static void directory_monitor_value_take_query_info_queue_element (GValue* value g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = v_object; -#line 7781 "DirectoryMonitor.c" +#line 7783 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 7785 "DirectoryMonitor.c" +#line 7787 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_unref (old); -#line 7791 "DirectoryMonitor.c" +#line 7793 "DirectoryMonitor.c" } } @@ -7803,7 +7805,7 @@ static void directory_monitor_query_info_queue_element_class_init (DirectoryMoni directory_monitor_query_info_queue_element_parent_class = g_type_class_peek_parent (klass); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" ((DirectoryMonitorQueryInfoQueueElementClass *) klass)->finalize = directory_monitor_query_info_queue_element_finalize; -#line 7801 "DirectoryMonitor.c" +#line 7803 "DirectoryMonitor.c" } @@ -7816,7 +7818,7 @@ static void directory_monitor_query_info_queue_element_instance_init (DirectoryM self->completed = FALSE; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->ref_count = 1; -#line 7814 "DirectoryMonitor.c" +#line 7816 "DirectoryMonitor.c" } @@ -7836,7 +7838,7 @@ static void directory_monitor_query_info_queue_element_finalize (DirectoryMonito _g_object_unref0 (self->info); #line 93 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_error_free0 (self->err); -#line 7834 "DirectoryMonitor.c" +#line 7836 "DirectoryMonitor.c" } @@ -7861,7 +7863,7 @@ static gpointer directory_monitor_query_info_queue_element_ref (gpointer instanc g_atomic_int_inc (&self->ref_count); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return instance; -#line 7859 "DirectoryMonitor.c" +#line 7861 "DirectoryMonitor.c" } @@ -7874,7 +7876,7 @@ static void directory_monitor_query_info_queue_element_unref (gpointer instance) DIRECTORY_MONITOR_QUERY_INFO_QUEUE_ELEMENT_GET_CLASS (self)->finalize (self); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_type_free_instance ((GTypeInstance *) self); -#line 7872 "DirectoryMonitor.c" +#line 7874 "DirectoryMonitor.c" } } @@ -7885,14 +7887,14 @@ static DirectoryMonitorFileInfoMap* directory_monitor_file_info_map_construct (G self = (DirectoryMonitorFileInfoMap*) g_type_create_instance (object_type); #line 134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return self; -#line 7883 "DirectoryMonitor.c" +#line 7885 "DirectoryMonitor.c" } static DirectoryMonitorFileInfoMap* directory_monitor_file_info_map_new (void) { #line 134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return directory_monitor_file_info_map_construct (DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP); -#line 7890 "DirectoryMonitor.c" +#line 7892 "DirectoryMonitor.c" } @@ -7933,7 +7935,7 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor _tmp2_ = local_info; #line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp2_ == NULL) { -#line 7931 "DirectoryMonitor.c" +#line 7933 "DirectoryMonitor.c" GeeHashMap* _tmp3_ = NULL; GFile* _tmp4_ = NULL; gpointer _tmp5_ = NULL; @@ -7968,25 +7970,25 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor if (normalized) { #line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *normalized = _vala_normalized; -#line 7966 "DirectoryMonitor.c" +#line 7968 "DirectoryMonitor.c" } else { #line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_normalized); -#line 7970 "DirectoryMonitor.c" +#line 7972 "DirectoryMonitor.c" } #line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (id) { #line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *id = _vala_id; -#line 7976 "DirectoryMonitor.c" +#line 7978 "DirectoryMonitor.c" } else { #line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_vala_id); -#line 7980 "DirectoryMonitor.c" +#line 7982 "DirectoryMonitor.c" } #line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7984 "DirectoryMonitor.c" +#line 7986 "DirectoryMonitor.c" } } #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8017,25 +8019,25 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor if (normalized) { #line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *normalized = _vala_normalized; -#line 8015 "DirectoryMonitor.c" +#line 8017 "DirectoryMonitor.c" } else { #line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_normalized); -#line 8019 "DirectoryMonitor.c" +#line 8021 "DirectoryMonitor.c" } #line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (id) { #line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *id = _vala_id; -#line 8025 "DirectoryMonitor.c" +#line 8027 "DirectoryMonitor.c" } else { #line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_vala_id); -#line 8029 "DirectoryMonitor.c" +#line 8031 "DirectoryMonitor.c" } #line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8033 "DirectoryMonitor.c" +#line 8035 "DirectoryMonitor.c" } #line 159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = self->priv->id_map; @@ -8057,20 +8059,20 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor _tmp16_ = known_file; #line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp16_ != NULL) { -#line 8055 "DirectoryMonitor.c" +#line 8057 "DirectoryMonitor.c" GFile* _tmp17_ = NULL; #line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp17_ = known_file; #line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = _tmp17_; -#line 8061 "DirectoryMonitor.c" +#line 8063 "DirectoryMonitor.c" } else { GFile* _tmp18_ = NULL; #line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = file; #line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = _tmp18_; -#line 8068 "DirectoryMonitor.c" +#line 8070 "DirectoryMonitor.c" } #line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = _g_object_ref0 (_tmp15_); @@ -8090,25 +8092,25 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor if (normalized) { #line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *normalized = _vala_normalized; -#line 8088 "DirectoryMonitor.c" +#line 8090 "DirectoryMonitor.c" } else { #line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_normalized); -#line 8092 "DirectoryMonitor.c" +#line 8094 "DirectoryMonitor.c" } #line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (id) { #line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *id = _vala_id; -#line 8098 "DirectoryMonitor.c" +#line 8100 "DirectoryMonitor.c" } else { #line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_vala_id); -#line 8102 "DirectoryMonitor.c" +#line 8104 "DirectoryMonitor.c" } #line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8106 "DirectoryMonitor.c" +#line 8108 "DirectoryMonitor.c" } @@ -8149,7 +8151,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); #line 169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp2_) { -#line 8147 "DirectoryMonitor.c" +#line 8149 "DirectoryMonitor.c" gboolean removed = FALSE; GeeHashMap* _tmp3_ = NULL; GFile* _tmp4_ = NULL; @@ -8167,7 +8169,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo _tmp6_ = removed; #line 171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp6_, "removed"); -#line 8165 "DirectoryMonitor.c" +#line 8167 "DirectoryMonitor.c" } #line 175 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = info; @@ -8179,7 +8181,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo _tmp10_ = existing_id; #line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp10_ != NULL) { -#line 8177 "DirectoryMonitor.c" +#line 8179 "DirectoryMonitor.c" GeeHashMap* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; gboolean _tmp13_ = FALSE; @@ -8191,15 +8193,15 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo _tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_); #line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = _tmp13_; -#line 8189 "DirectoryMonitor.c" +#line 8191 "DirectoryMonitor.c" } else { #line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = FALSE; -#line 8193 "DirectoryMonitor.c" +#line 8195 "DirectoryMonitor.c" } #line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp9_) { -#line 8197 "DirectoryMonitor.c" +#line 8199 "DirectoryMonitor.c" gboolean removed = FALSE; GeeHashMap* _tmp14_ = NULL; const gchar* _tmp15_ = NULL; @@ -8217,7 +8219,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo _tmp17_ = removed; #line 178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp17_, "removed"); -#line 8215 "DirectoryMonitor.c" +#line 8217 "DirectoryMonitor.c" } #line 183 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = file; @@ -8245,7 +8247,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo _g_free0 (existing_id); #line 184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8243 "DirectoryMonitor.c" +#line 8245 "DirectoryMonitor.c" } #line 186 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp23_ = self->priv->map; @@ -8273,7 +8275,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo _g_free0 (existing_id); #line 189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8271 "DirectoryMonitor.c" +#line 8273 "DirectoryMonitor.c" } @@ -8320,7 +8322,7 @@ static gboolean directory_monitor_file_info_map_remove (DirectoryMonitorFileInfo _g_free0 (id); #line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8318 "DirectoryMonitor.c" +#line 8320 "DirectoryMonitor.c" } #line 198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = self->priv->map; @@ -8342,7 +8344,7 @@ static gboolean directory_monitor_file_info_map_remove (DirectoryMonitorFileInfo _g_free0 (id); #line 201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8340 "DirectoryMonitor.c" +#line 8342 "DirectoryMonitor.c" } @@ -8351,7 +8353,7 @@ static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfo g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self)); #line 206 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (GEE_IS_COLLECTION (files)); -#line 8349 "DirectoryMonitor.c" +#line 8351 "DirectoryMonitor.c" { GeeIterator* _file_it = NULL; GeeCollection* _tmp0_ = NULL; @@ -8364,7 +8366,7 @@ static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfo _file_it = _tmp1_; #line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 8362 "DirectoryMonitor.c" +#line 8364 "DirectoryMonitor.c" GeeIterator* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; GFile* file = NULL; @@ -8379,7 +8381,7 @@ static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfo if (!_tmp3_) { #line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 8377 "DirectoryMonitor.c" +#line 8379 "DirectoryMonitor.c" } #line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _file_it; @@ -8393,11 +8395,11 @@ static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfo directory_monitor_file_info_map_remove (self, _tmp6_, NULL); #line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (file); -#line 8391 "DirectoryMonitor.c" +#line 8393 "DirectoryMonitor.c" } #line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_file_it); -#line 8395 "DirectoryMonitor.c" +#line 8397 "DirectoryMonitor.c" } } @@ -8444,7 +8446,7 @@ static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileIn _g_free0 (id); #line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8442 "DirectoryMonitor.c" +#line 8444 "DirectoryMonitor.c" } #line 217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = self->priv->id_map; @@ -8460,7 +8462,7 @@ static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileIn _g_free0 (id); #line 217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8458 "DirectoryMonitor.c" +#line 8460 "DirectoryMonitor.c" } @@ -8483,7 +8485,7 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa _tmp0_ = info; #line 222 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp0_ != NULL) { -#line 8481 "DirectoryMonitor.c" +#line 8483 "DirectoryMonitor.c" GFileInfo* _tmp1_ = NULL; gchar* _tmp2_ = NULL; #line 223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8494,7 +8496,7 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa result = _tmp2_; #line 223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8492 "DirectoryMonitor.c" +#line 8494 "DirectoryMonitor.c" } #line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = file; @@ -8518,7 +8520,7 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa _g_free0 (id); #line 228 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8516 "DirectoryMonitor.c" +#line 8518 "DirectoryMonitor.c" } #line 230 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = id; @@ -8526,7 +8528,7 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa _g_object_unref0 (normalized); #line 230 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8524 "DirectoryMonitor.c" +#line 8526 "DirectoryMonitor.c" } @@ -8540,14 +8542,14 @@ static GeeCollection* directory_monitor_file_info_map_get_all (DirectoryMonitorF #line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->map; #line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap)); + _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; #line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8545 "DirectoryMonitor.c" +#line 8547 "DirectoryMonitor.c" } @@ -8587,7 +8589,7 @@ static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFile result = info; #line 241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8585 "DirectoryMonitor.c" +#line 8587 "DirectoryMonitor.c" } #line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = file; @@ -8613,7 +8615,7 @@ static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFile _g_object_unref0 (info); #line 246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8611 "DirectoryMonitor.c" +#line 8613 "DirectoryMonitor.c" } #line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = self->priv->map; @@ -8631,7 +8633,7 @@ static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFile _g_object_unref0 (info); #line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8629 "DirectoryMonitor.c" +#line 8631 "DirectoryMonitor.c" } @@ -8677,7 +8679,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi result = info; #line 254 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8675 "DirectoryMonitor.c" +#line 8677 "DirectoryMonitor.c" } { GFileInfo* _tmp3_ = NULL; @@ -8695,7 +8697,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi _tmp3_ = _tmp6_; #line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8693 "DirectoryMonitor.c" +#line 8695 "DirectoryMonitor.c" goto __catch484_g_error; } #line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8708,7 +8710,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi info = _tmp7_; #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_tmp3_); -#line 8706 "DirectoryMonitor.c" +#line 8708 "DirectoryMonitor.c" } goto __finally484; __catch484_g_error: @@ -8745,7 +8747,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi _g_object_unref0 (info); #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8743 "DirectoryMonitor.c" +#line 8745 "DirectoryMonitor.c" } __finally484: #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8758,7 +8760,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi g_clear_error (&_inner_error_); #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 8756 "DirectoryMonitor.c" +#line 8758 "DirectoryMonitor.c" } #line 266 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = info; @@ -8772,7 +8774,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi _g_object_unref0 (info); #line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8770 "DirectoryMonitor.c" +#line 8772 "DirectoryMonitor.c" } #line 269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = info; @@ -8794,7 +8796,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi _g_object_unref0 (info); #line 271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8792 "DirectoryMonitor.c" +#line 8794 "DirectoryMonitor.c" } #line 273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = self->priv->id_map; @@ -8818,7 +8820,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi _g_object_unref0 (info); #line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8816 "DirectoryMonitor.c" +#line 8818 "DirectoryMonitor.c" } #line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp23_ = self->priv->map; @@ -8836,7 +8838,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi _g_object_unref0 (info); #line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8834 "DirectoryMonitor.c" +#line 8836 "DirectoryMonitor.c" } @@ -8872,7 +8874,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn _g_free0 (match_id); #line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8870 "DirectoryMonitor.c" +#line 8872 "DirectoryMonitor.c" } #line 286 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = match; @@ -8886,7 +8888,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn g_file_info_get_modification_time (_tmp5_, &_tmp6_); #line 287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" match_time = _tmp6_; -#line 8884 "DirectoryMonitor.c" +#line 8886 "DirectoryMonitor.c" { GeeIterator* _file_it = NULL; GeeHashMap* _tmp7_ = NULL; @@ -8898,7 +8900,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = self->priv->map; #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp8_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_MAP, GeeMap)); + _tmp8_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = _tmp8_; #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8913,7 +8915,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn _file_it = _tmp12_; #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 8911 "DirectoryMonitor.c" +#line 8913 "DirectoryMonitor.c" GeeIterator* _tmp13_ = NULL; gboolean _tmp14_ = FALSE; GFile* file = NULL; @@ -8946,7 +8948,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn if (!_tmp14_) { #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 8944 "DirectoryMonitor.c" +#line 8946 "DirectoryMonitor.c" } #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = _file_it; @@ -8986,7 +8988,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn _g_free0 (match_id); #line 294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8984 "DirectoryMonitor.c" +#line 8986 "DirectoryMonitor.c" } #line 297 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp25_ = match_size; @@ -9002,7 +9004,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn _g_object_unref0 (file); #line 298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 9000 "DirectoryMonitor.c" +#line 9002 "DirectoryMonitor.c" } #line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp28_ = info; @@ -9026,7 +9028,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn _g_object_unref0 (file); #line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 9024 "DirectoryMonitor.c" +#line 9026 "DirectoryMonitor.c" } #line 305 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = file; @@ -9038,11 +9040,11 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn _g_free0 (match_id); #line 305 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 9036 "DirectoryMonitor.c" +#line 9038 "DirectoryMonitor.c" } #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_file_it); -#line 9040 "DirectoryMonitor.c" +#line 9042 "DirectoryMonitor.c" } #line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = NULL; @@ -9050,7 +9052,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn _g_free0 (match_id); #line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 9048 "DirectoryMonitor.c" +#line 9050 "DirectoryMonitor.c" } @@ -9065,7 +9067,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (descendents)); #line 312 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" pruned = NULL; -#line 9063 "DirectoryMonitor.c" +#line 9065 "DirectoryMonitor.c" { GeeIterator* _file_it = NULL; GeeHashMap* _tmp0_ = NULL; @@ -9077,7 +9079,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->map; #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap)); + _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9092,7 +9094,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor _file_it = _tmp5_; #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 9090 "DirectoryMonitor.c" +#line 9092 "DirectoryMonitor.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; GFile* file = NULL; @@ -9109,7 +9111,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor if (!_tmp7_) { #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9107 "DirectoryMonitor.c" +#line 9109 "DirectoryMonitor.c" } #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = _file_it; @@ -9125,7 +9127,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor parent = _tmp11_; #line 315 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 9123 "DirectoryMonitor.c" +#line 9125 "DirectoryMonitor.c" GFile* _tmp12_ = NULL; GFile* _tmp13_ = NULL; GFile* _tmp14_ = NULL; @@ -9138,7 +9140,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor if (!(_tmp12_ != NULL)) { #line 315 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9136 "DirectoryMonitor.c" +#line 9138 "DirectoryMonitor.c" } #line 316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = parent; @@ -9148,7 +9150,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor _tmp15_ = g_file_equal (_tmp13_, _tmp14_); #line 316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp15_) { -#line 9146 "DirectoryMonitor.c" +#line 9148 "DirectoryMonitor.c" GeeArrayList* _tmp16_ = NULL; GeeArrayList* _tmp18_ = NULL; GFile* _tmp19_ = NULL; @@ -9162,15 +9164,15 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor _tmp16_ = pruned; #line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp16_ == NULL) { -#line 9160 "DirectoryMonitor.c" +#line 9162 "DirectoryMonitor.c" GeeArrayList* _tmp17_ = NULL; #line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp17_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp17_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (pruned); #line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" pruned = _tmp17_; -#line 9168 "DirectoryMonitor.c" +#line 9170 "DirectoryMonitor.c" } #line 320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = pruned; @@ -9196,7 +9198,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor _g_object_unref0 (_tmp25_); #line 323 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9194 "DirectoryMonitor.c" +#line 9196 "DirectoryMonitor.c" } #line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp26_ = parent; @@ -9206,33 +9208,33 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor _g_object_unref0 (parent); #line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" parent = _tmp27_; -#line 9204 "DirectoryMonitor.c" +#line 9206 "DirectoryMonitor.c" } #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (parent); #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (file); -#line 9210 "DirectoryMonitor.c" +#line 9212 "DirectoryMonitor.c" } #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_file_it); -#line 9214 "DirectoryMonitor.c" +#line 9216 "DirectoryMonitor.c" } #line 330 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp28_ = pruned; #line 330 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp28_ != NULL) { -#line 9220 "DirectoryMonitor.c" +#line 9222 "DirectoryMonitor.c" GeeArrayList* _tmp29_ = NULL; #line 331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp29_ = pruned; #line 331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_remove_all (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 9226 "DirectoryMonitor.c" +#line 9228 "DirectoryMonitor.c" } #line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (pruned); -#line 9230 "DirectoryMonitor.c" +#line 9232 "DirectoryMonitor.c" } @@ -9249,7 +9251,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn g_return_val_if_fail (GEE_IS_COLLECTION (dirs), 0); #line 337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" count = 0; -#line 9247 "DirectoryMonitor.c" +#line 9249 "DirectoryMonitor.c" { GeeIterator* _file_it = NULL; GeeHashMap* _tmp0_ = NULL; @@ -9261,7 +9263,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->map; #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap)); + _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp1_; #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9276,7 +9278,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn _file_it = _tmp5_; #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 9274 "DirectoryMonitor.c" +#line 9276 "DirectoryMonitor.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; GFile* file = NULL; @@ -9303,7 +9305,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn if (!_tmp7_) { #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9301 "DirectoryMonitor.c" +#line 9303 "DirectoryMonitor.c" } #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = _file_it; @@ -9323,7 +9325,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn if (_tmp13_ == NULL) { #line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = TRUE; -#line 9321 "DirectoryMonitor.c" +#line 9323 "DirectoryMonitor.c" } else { GFile* _tmp14_ = NULL; GFile* _tmp15_ = NULL; @@ -9336,7 +9338,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn _tmp16_ = g_file_equal (_tmp14_, _tmp15_); #line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = !_tmp16_; -#line 9334 "DirectoryMonitor.c" +#line 9336 "DirectoryMonitor.c" } #line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp12_) { @@ -9346,7 +9348,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn _g_object_unref0 (file); #line 341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 9344 "DirectoryMonitor.c" +#line 9346 "DirectoryMonitor.c" } #line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp17_ = self->priv->map; @@ -9370,7 +9372,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn switch (_tmp23_) { #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 9368 "DirectoryMonitor.c" +#line 9370 "DirectoryMonitor.c" { GeeCollection* _tmp24_ = NULL; GFile* _tmp25_ = NULL; @@ -9387,11 +9389,11 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn count = _tmp26_ + 1; #line 348 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9385 "DirectoryMonitor.c" +#line 9387 "DirectoryMonitor.c" } #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 9389 "DirectoryMonitor.c" +#line 9391 "DirectoryMonitor.c" { GeeCollection* _tmp27_ = NULL; GFile* _tmp28_ = NULL; @@ -9408,7 +9410,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn count = _tmp29_ + 1; #line 353 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9406 "DirectoryMonitor.c" +#line 9408 "DirectoryMonitor.c" } default: { @@ -9419,31 +9421,31 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn _vala_assert (_tmp30_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9417 "DirectoryMonitor.c" +#line 9419 "DirectoryMonitor.c" } } #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (parent); #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (file); -#line 9424 "DirectoryMonitor.c" +#line 9426 "DirectoryMonitor.c" } #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_file_it); -#line 9428 "DirectoryMonitor.c" +#line 9430 "DirectoryMonitor.c" } #line 361 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = count; #line 361 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 9434 "DirectoryMonitor.c" +#line 9436 "DirectoryMonitor.c" } static void directory_monitor_value_file_info_map_init (GValue* value) { #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 9441 "DirectoryMonitor.c" +#line 9443 "DirectoryMonitor.c" } @@ -9452,7 +9454,7 @@ static void directory_monitor_value_file_info_map_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_unref (value->data[0].v_pointer); -#line 9450 "DirectoryMonitor.c" +#line 9452 "DirectoryMonitor.c" } } @@ -9462,11 +9464,11 @@ static void directory_monitor_value_file_info_map_copy_value (const GValue* src_ if (src_value->data[0].v_pointer) { #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" dest_value->data[0].v_pointer = directory_monitor_file_info_map_ref (src_value->data[0].v_pointer); -#line 9460 "DirectoryMonitor.c" +#line 9462 "DirectoryMonitor.c" } else { #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 9464 "DirectoryMonitor.c" +#line 9466 "DirectoryMonitor.c" } } @@ -9474,37 +9476,37 @@ static void directory_monitor_value_file_info_map_copy_value (const GValue* src_ static gpointer directory_monitor_value_file_info_map_peek_pointer (const GValue* value) { #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return value->data[0].v_pointer; -#line 9472 "DirectoryMonitor.c" +#line 9474 "DirectoryMonitor.c" } static gchar* directory_monitor_value_file_info_map_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (collect_values[0].v_pointer) { -#line 9479 "DirectoryMonitor.c" +#line 9481 "DirectoryMonitor.c" DirectoryMonitorFileInfoMap* object; object = collect_values[0].v_pointer; #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (object->parent_instance.g_class == NULL) { #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9486 "DirectoryMonitor.c" +#line 9488 "DirectoryMonitor.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.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 9490 "DirectoryMonitor.c" +#line 9492 "DirectoryMonitor.c" } #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = directory_monitor_file_info_map_ref (object); -#line 9494 "DirectoryMonitor.c" +#line 9496 "DirectoryMonitor.c" } else { #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 9498 "DirectoryMonitor.c" +#line 9500 "DirectoryMonitor.c" } #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 9502 "DirectoryMonitor.c" +#line 9504 "DirectoryMonitor.c" } @@ -9515,25 +9517,25 @@ static gchar* directory_monitor_value_file_info_map_lcopy_value (const GValue* v if (!object_p) { #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 9513 "DirectoryMonitor.c" +#line 9515 "DirectoryMonitor.c" } #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!value->data[0].v_pointer) { #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = NULL; -#line 9519 "DirectoryMonitor.c" +#line 9521 "DirectoryMonitor.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = value->data[0].v_pointer; -#line 9523 "DirectoryMonitor.c" +#line 9525 "DirectoryMonitor.c" } else { #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = directory_monitor_file_info_map_ref (value->data[0].v_pointer); -#line 9527 "DirectoryMonitor.c" +#line 9529 "DirectoryMonitor.c" } #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 9531 "DirectoryMonitor.c" +#line 9533 "DirectoryMonitor.c" } @@ -9547,7 +9549,7 @@ static GParamSpec* directory_monitor_param_spec_file_info_map (const gchar* name G_PARAM_SPEC (spec)->value_type = object_type; #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return G_PARAM_SPEC (spec); -#line 9545 "DirectoryMonitor.c" +#line 9547 "DirectoryMonitor.c" } @@ -9556,7 +9558,7 @@ static gpointer directory_monitor_value_get_file_info_map (const GValue* value) g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP), NULL); #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return value->data[0].v_pointer; -#line 9554 "DirectoryMonitor.c" +#line 9556 "DirectoryMonitor.c" } @@ -9576,17 +9578,17 @@ static void directory_monitor_value_set_file_info_map (GValue* value, gpointer v value->data[0].v_pointer = v_object; #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_ref (value->data[0].v_pointer); -#line 9574 "DirectoryMonitor.c" +#line 9576 "DirectoryMonitor.c" } else { #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 9578 "DirectoryMonitor.c" +#line 9580 "DirectoryMonitor.c" } #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old) { #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_unref (old); -#line 9584 "DirectoryMonitor.c" +#line 9586 "DirectoryMonitor.c" } } @@ -9605,17 +9607,17 @@ static void directory_monitor_value_take_file_info_map (GValue* value, gpointer g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = v_object; -#line 9603 "DirectoryMonitor.c" +#line 9605 "DirectoryMonitor.c" } else { #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 9607 "DirectoryMonitor.c" +#line 9609 "DirectoryMonitor.c" } #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old) { #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_unref (old); -#line 9613 "DirectoryMonitor.c" +#line 9615 "DirectoryMonitor.c" } } @@ -9627,7 +9629,7 @@ static void directory_monitor_file_info_map_class_init (DirectoryMonitorFileInfo ((DirectoryMonitorFileInfoMapClass *) klass)->finalize = directory_monitor_file_info_map_finalize; #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_type_class_add_private (klass, sizeof (DirectoryMonitorFileInfoMapPrivate)); -#line 9625 "DirectoryMonitor.c" +#line 9627 "DirectoryMonitor.c" } @@ -9637,16 +9639,16 @@ static void directory_monitor_file_info_map_instance_init (DirectoryMonitorFileI #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv = DIRECTORY_MONITOR_FILE_INFO_MAP_GET_PRIVATE (self); #line 129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_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, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_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, NULL, NULL, NULL); #line 129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->map = _tmp0_; #line 131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = 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, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->id_map = _tmp1_; #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->ref_count = 1; -#line 9644 "DirectoryMonitor.c" +#line 9646 "DirectoryMonitor.c" } @@ -9660,7 +9662,7 @@ static void directory_monitor_file_info_map_finalize (DirectoryMonitorFileInfoMa _g_object_unref0 (self->priv->map); #line 131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (self->priv->id_map); -#line 9658 "DirectoryMonitor.c" +#line 9660 "DirectoryMonitor.c" } @@ -9685,7 +9687,7 @@ static gpointer directory_monitor_file_info_map_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return instance; -#line 9683 "DirectoryMonitor.c" +#line 9685 "DirectoryMonitor.c" } @@ -9698,7 +9700,7 @@ static void directory_monitor_file_info_map_unref (gpointer instance) { DIRECTORY_MONITOR_FILE_INFO_MAP_GET_CLASS (self)->finalize (self); #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_type_free_instance ((GTypeInstance *) self); -#line 9696 "DirectoryMonitor.c" +#line 9698 "DirectoryMonitor.c" } } @@ -9709,51 +9711,51 @@ static void directory_monitor_class_init (DirectoryMonitorClass * klass) { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_type_class_add_private (klass, sizeof (DirectoryMonitorPrivate)); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_root_deleted = directory_monitor_real_notify_root_deleted; + ((DirectoryMonitorClass *) klass)->notify_root_deleted = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_root_deleted; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_root_moved = directory_monitor_real_notify_root_moved; + ((DirectoryMonitorClass *) klass)->notify_root_moved = (void (*)(DirectoryMonitor*, GFile*, GFile*, GFileInfo*)) directory_monitor_real_notify_root_moved; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_discovery_started = directory_monitor_real_notify_discovery_started; + ((DirectoryMonitorClass *) klass)->notify_discovery_started = (void (*)(DirectoryMonitor*)) directory_monitor_real_notify_discovery_started; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->internal_notify_file_discovered = directory_monitor_real_internal_notify_file_discovered; + ((DirectoryMonitorClass *) klass)->internal_notify_file_discovered = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_internal_notify_file_discovered; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_discovered = directory_monitor_real_notify_file_discovered; + ((DirectoryMonitorClass *) klass)->notify_file_discovered = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_notify_file_discovered; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->internal_notify_directory_discovered = directory_monitor_real_internal_notify_directory_discovered; + ((DirectoryMonitorClass *) klass)->internal_notify_directory_discovered = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_internal_notify_directory_discovered; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_directory_discovered = directory_monitor_real_notify_directory_discovered; + ((DirectoryMonitorClass *) klass)->notify_directory_discovered = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_discovered; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_discovery_failed = directory_monitor_real_notify_discovery_failed; + ((DirectoryMonitorClass *) klass)->notify_discovery_failed = (void (*)(DirectoryMonitor*, const gchar*)) directory_monitor_real_notify_discovery_failed; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_discovery_completed = directory_monitor_real_notify_discovery_completed; + ((DirectoryMonitorClass *) klass)->notify_discovery_completed = (void (*)(DirectoryMonitor*)) directory_monitor_real_notify_discovery_completed; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_created = directory_monitor_real_notify_file_created; + ((DirectoryMonitorClass *) klass)->notify_file_created = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_notify_file_created; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_moved = directory_monitor_real_notify_file_moved; + ((DirectoryMonitorClass *) klass)->notify_file_moved = (void (*)(DirectoryMonitor*, GFile*, GFile*, GFileInfo*)) directory_monitor_real_notify_file_moved; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_altered = directory_monitor_real_notify_file_altered; + ((DirectoryMonitorClass *) klass)->notify_file_altered = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_file_altered; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_alteration_completed = directory_monitor_real_notify_file_alteration_completed; + ((DirectoryMonitorClass *) klass)->notify_file_alteration_completed = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_notify_file_alteration_completed; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_attributes_altered = directory_monitor_real_notify_file_attributes_altered; + ((DirectoryMonitorClass *) klass)->notify_file_attributes_altered = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_file_attributes_altered; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_deleted = directory_monitor_real_notify_file_deleted; + ((DirectoryMonitorClass *) klass)->notify_file_deleted = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_file_deleted; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_directory_created = directory_monitor_real_notify_directory_created; + ((DirectoryMonitorClass *) klass)->notify_directory_created = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_created; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_directory_moved = directory_monitor_real_notify_directory_moved; + ((DirectoryMonitorClass *) klass)->notify_directory_moved = (void (*)(DirectoryMonitor*, GFile*, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_moved; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_directory_altered = directory_monitor_real_notify_directory_altered; + ((DirectoryMonitorClass *) klass)->notify_directory_altered = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_directory_altered; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_directory_alteration_completed = directory_monitor_real_notify_directory_alteration_completed; + ((DirectoryMonitorClass *) klass)->notify_directory_alteration_completed = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_alteration_completed; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_directory_attributes_altered = directory_monitor_real_notify_directory_attributes_altered; + ((DirectoryMonitorClass *) klass)->notify_directory_attributes_altered = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_directory_attributes_altered; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_directory_deleted = directory_monitor_real_notify_directory_deleted; + ((DirectoryMonitorClass *) klass)->notify_directory_deleted = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_directory_deleted; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_closed = directory_monitor_real_notify_closed; + ((DirectoryMonitorClass *) klass)->notify_closed = (void (*)(DirectoryMonitor*)) directory_monitor_real_notify_closed; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->close = directory_monitor_real_close; + ((DirectoryMonitorClass *) klass)->close = (void (*)(DirectoryMonitor*)) directory_monitor_real_close; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" ((DirectoryMonitorClass *) klass)->root_moved = directory_monitor_real_root_moved; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9836,7 +9838,7 @@ static void directory_monitor_class_init (DirectoryMonitorClass * klass) { g_signal_new ("directory_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_new ("closed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, closed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 9834 "DirectoryMonitor.c" +#line 9836 "DirectoryMonitor.c" } @@ -9849,11 +9851,11 @@ static void directory_monitor_instance_init (DirectoryMonitor * self) { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv = DIRECTORY_MONITOR_GET_PRIVATE (self); #line 368 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, g_file_monitor_get_type (), (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, (GDestroyNotify) g_free, g_file_monitor_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 368 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->monitors = _tmp0_; #line 369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = gee_linked_list_new (DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT, (GBoxedCopyFunc) directory_monitor_query_info_queue_element_ref, directory_monitor_query_info_queue_element_unref, NULL, NULL, NULL); + _tmp1_ = gee_linked_list_new (DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT, (GBoxedCopyFunc) directory_monitor_query_info_queue_element_ref, (GDestroyNotify) directory_monitor_query_info_queue_element_unref, NULL, NULL, NULL); #line 369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->query_info_queue = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_QUEUE, GeeQueue); #line 371 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9876,7 +9878,7 @@ static void directory_monitor_instance_init (DirectoryMonitor * self) { self->priv->has_discovery_started = FALSE; #line 377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->delete_timer_id = (guint) 0; -#line 9874 "DirectoryMonitor.c" +#line 9876 "DirectoryMonitor.c" } @@ -9898,7 +9900,7 @@ static void directory_monitor_finalize (GObject* obj) { _g_object_unref0 (self->priv->cancellable); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" G_OBJECT_CLASS (directory_monitor_parent_class)->finalize (obj); -#line 9896 "DirectoryMonitor.c" +#line 9898 "DirectoryMonitor.c" } |