summaryrefslogtreecommitdiff
path: root/src/LibraryMonitor.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:17:10 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:17:10 +0100
commita7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (patch)
treed9f86def771c7845f241ec81219b243c70523c60 /src/LibraryMonitor.c
parent66f6a7bd3f7e00022191f16cb0e82a39e7333a76 (diff)
New upstream version 0.25.3upstream/0.25.3
Diffstat (limited to 'src/LibraryMonitor.c')
-rw-r--r--src/LibraryMonitor.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/LibraryMonitor.c b/src/LibraryMonitor.c
index 761ddd2..ea83be6 100644
--- a/src/LibraryMonitor.c
+++ b/src/LibraryMonitor.c
@@ -1,4 +1,4 @@
-/* LibraryMonitor.c generated by valac 0.32.1, the Vala compiler
+/* LibraryMonitor.c generated by valac 0.34.4, the Vala compiler
* generated from LibraryMonitor.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2251,7 +2251,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
#line 287 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
self->priv->discovered = _tmp28_;
#line 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
- _tmp29_ = gee_hash_set_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+ _tmp29_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
#line 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
_g_object_unref0 (self->priv->unknown_files);
#line 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2624,7 +2624,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
#line 338 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
_data_->_tmp4_ = NULL;
#line 338 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
- _data_->_tmp4_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
+ _data_->_tmp4_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
#line 338 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
_data_->adopted = _data_->_tmp4_;
#line 2631 "LibraryMonitor.c"
@@ -4123,7 +4123,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
#line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
#line 4126 "LibraryMonitor.c"
- goto __catch482_g_error;
+ goto __catch484_g_error;
}
#line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
_data_->_tmp31_ = NULL;
@@ -4139,8 +4139,8 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
_g_object_unref0 (_data_->_tmp27_);
#line 4141 "LibraryMonitor.c"
}
- goto __finally482;
- __catch482_g_error:
+ goto __finally484;
+ __catch484_g_error:
{
#line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
_data_->err = _data_->_inner_error_;
@@ -4150,7 +4150,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
_g_error_free0 (_data_->err);
#line 4152 "LibraryMonitor.c"
}
- __finally482:
+ __finally484:
#line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
#line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5384,7 +5384,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
#line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 5387 "LibraryMonitor.c"
- goto __catch483_database_error;
+ goto __catch485_database_error;
}
#line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
_g_object_unref0 (to_tombstone);
@@ -5397,8 +5397,8 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
#line 5398 "LibraryMonitor.c"
}
}
- goto __finally483;
- __catch483_database_error:
+ goto __finally485;
+ __catch485_database_error:
{
GError* err = NULL;
GError* _tmp58_ = NULL;
@@ -5414,7 +5414,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
_g_error_free0 (err);
#line 5416 "LibraryMonitor.c"
}
- __finally483:
+ __finally485:
#line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5502,7 +5502,7 @@ void library_monitor_blacklist_file (GFile* file, const gchar* reason) {
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_);
#line 5504 "LibraryMonitor.c"
}
- __finally484:
+ __finally486:
{
GeeHashSet* _tmp9_ = NULL;
#line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5582,7 +5582,7 @@ void library_monitor_unblacklist_file (GFile* file) {
#line 5583 "LibraryMonitor.c"
}
}
- __finally485:
+ __finally487:
{
GeeHashSet* _tmp10_ = NULL;
#line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5632,7 +5632,7 @@ static void library_monitor_on_unblacklist_file (GFile* file) {
removed = _tmp3_;
#line 5634 "LibraryMonitor.c"
}
- __finally486:
+ __finally488:
{
GeeHashSet* _tmp4_ = NULL;
#line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5734,7 +5734,7 @@ gboolean library_monitor_is_blacklisted (GFile* file) {
return result;
#line 5736 "LibraryMonitor.c"
}
- __finally487:
+ __finally489:
{
GeeHashSet* _tmp5_ = NULL;
#line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6053,7 +6053,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
#line 6054 "LibraryMonitor.c"
GeeArrayList* _tmp39_ = NULL;
#line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
- _tmp39_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
+ _tmp39_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
#line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
_g_object_unref0 (to_import);
#line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7858,7 +7858,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
#line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 7860 "LibraryMonitor.c"
- goto __catch488_g_error;
+ goto __catch490_g_error;
}
#line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
_tmp18_ = _tmp15_;
@@ -7872,8 +7872,8 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
_g_free0 (_tmp15_);
#line 7873 "LibraryMonitor.c"
}
- goto __finally488;
- __catch488_g_error:
+ goto __finally490;
+ __catch490_g_error:
{
GError* err = NULL;
GError* _tmp19_ = NULL;
@@ -7900,7 +7900,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
return;
#line 7901 "LibraryMonitor.c"
}
- __finally488:
+ __finally490:
#line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8212,7 +8212,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
#line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 8213 "LibraryMonitor.c"
- goto __catch489_g_error;
+ goto __catch491_g_error;
}
#line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
_tmp3_ = _tmp0_;
@@ -8226,8 +8226,8 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
_g_free0 (_tmp0_);
#line 8226 "LibraryMonitor.c"
}
- goto __finally489;
- __catch489_g_error:
+ goto __finally491;
+ __catch491_g_error:
{
GError* err = NULL;
GError* _tmp4_ = NULL;
@@ -8252,7 +8252,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
return;
#line 8252 "LibraryMonitor.c"
}
- __finally489:
+ __finally491:
#line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8727,11 +8727,11 @@ static void library_monitor_class_init (LibraryMonitorClass * klass) {
#line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
g_rec_mutex_init (&__lock_library_monitor_blacklist);
#line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
- _tmp0_ = gee_hash_set_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+ _tmp0_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
#line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
library_monitor_blacklist = _tmp0_;
#line 207 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
- _tmp1_ = hash_timed_queue_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, (guint) LIBRARY_MONITOR_MIN_BLACKLIST_DURATION_MSEC, _library_monitor_on_unblacklist_file_dequeued_callback, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, G_PRIORITY_LOW);
+ _tmp1_ = hash_timed_queue_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, (guint) LIBRARY_MONITOR_MIN_BLACKLIST_DURATION_MSEC, _library_monitor_on_unblacklist_file_dequeued_callback, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, G_PRIORITY_LOW);
#line 207 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
library_monitor_to_unblacklist = _tmp1_;
#line 8736 "LibraryMonitor.c"
@@ -8770,11 +8770,11 @@ static void library_monitor_instance_init (LibraryMonitor * self) {
#line 215 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
self->priv->discovered = NULL;
#line 216 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
- _tmp4_ = gee_hash_set_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+ _tmp4_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
#line 216 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
self->priv->import_queue = _tmp4_;
#line 217 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
- _tmp5_ = gee_hash_set_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+ _tmp5_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
#line 217 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
self->priv->pending_imports = _tmp5_;
#line 218 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"