summaryrefslogtreecommitdiff
path: root/src/threads
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:19:04 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:19:04 +0100
commitf39ea21098340bd99c48669f152c9068046c2c99 (patch)
treed1166fce1a4a8c470dfaf364816f767678c4729e /src/threads
parentbc48a4cff815ed156b603c92e684779c317417ba (diff)
parenta7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (diff)
Merge tag 'upstream/0.25.3'
Upstream version 0.25.3
Diffstat (limited to 'src/threads')
-rw-r--r--src/threads/BackgroundJob.c6
-rw-r--r--src/threads/Semaphore.c2
-rw-r--r--src/threads/Threads.c2
-rw-r--r--src/threads/Workers.c24
4 files changed, 17 insertions, 17 deletions
diff --git a/src/threads/BackgroundJob.c b/src/threads/BackgroundJob.c
index 006e1b0..ec7c78f 100644
--- a/src/threads/BackgroundJob.c
+++ b/src/threads/BackgroundJob.c
@@ -1,4 +1,4 @@
-/* BackgroundJob.c generated by valac 0.32.1, the Vala compiler
+/* BackgroundJob.c generated by valac 0.34.4, the Vala compiler
* generated from BackgroundJob.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1155,7 +1155,7 @@ void background_job_notify (BackgroundJob* self, NotificationCallback callback,
_background_job_notification_job_unref0 (_tmp5_);
#line 1157 "BackgroundJob.c"
}
- __finally11:
+ __finally13:
{
GeeArrayList* _tmp6_ = NULL;
#line 210 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1258,7 +1258,7 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) {
#line 1259 "BackgroundJob.c"
}
}
- __finally12:
+ __finally14:
{
GeeArrayList* _tmp6_ = NULL;
#line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
diff --git a/src/threads/Semaphore.c b/src/threads/Semaphore.c
index 9874b65..34c55e4 100644
--- a/src/threads/Semaphore.c
+++ b/src/threads/Semaphore.c
@@ -1,4 +1,4 @@
-/* Semaphore.c generated by valac 0.32.1, the Vala compiler
+/* Semaphore.c generated by valac 0.34.4, the Vala compiler
* generated from Semaphore.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/threads/Threads.c b/src/threads/Threads.c
index d87457f..e50f83e 100644
--- a/src/threads/Threads.c
+++ b/src/threads/Threads.c
@@ -1,4 +1,4 @@
-/* Threads.c generated by valac 0.32.1, the Vala compiler
+/* Threads.c generated by valac 0.34.4, the Vala compiler
* generated from Threads.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/threads/Workers.c b/src/threads/Workers.c
index 92d5e97..312f3e3 100644
--- a/src/threads/Workers.c
+++ b/src/threads/Workers.c
@@ -1,4 +1,4 @@
-/* Workers.c generated by valac 0.32.1, the Vala compiler
+/* Workers.c generated by valac 0.34.4, the Vala compiler
* generated from Workers.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -312,7 +312,7 @@ Workers* workers_construct (GType object_type, guint max_threads, gboolean exclu
#line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala"
if (_inner_error_->domain == G_THREAD_ERROR) {
#line 315 "Workers.c"
- goto __catch6_g_thread_error;
+ goto __catch8_g_thread_error;
}
#line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -334,8 +334,8 @@ Workers* workers_construct (GType object_type, guint max_threads, gboolean exclu
_g_thread_pool_free0 (_tmp4_);
#line 336 "Workers.c"
}
- goto __finally6;
- __catch6_g_thread_error:
+ goto __finally8;
+ __catch8_g_thread_error:
{
GError* err = NULL;
const gchar* _tmp9_ = NULL;
@@ -351,7 +351,7 @@ Workers* workers_construct (GType object_type, guint max_threads, gboolean exclu
_g_error_free0 (err);
#line 353 "Workers.c"
}
- __finally6:
+ __finally8:
#line 30 "/home/jens/Source/shotwell/src/threads/Workers.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 30 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -508,7 +508,7 @@ void workers_enqueue (Workers* self, BackgroundJob* job) {
self->priv->enqueued = _tmp5_ + 1;
#line 510 "Workers.c"
}
- __finally7:
+ __finally9:
{
GAsyncQueue* _tmp6_ = NULL;
#line 54 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -542,7 +542,7 @@ void workers_enqueue (Workers* self, BackgroundJob* job) {
#line 60 "/home/jens/Source/shotwell/src/threads/Workers.vala"
if (_inner_error_->domain == G_THREAD_ERROR) {
#line 545 "Workers.c"
- goto __catch8_g_thread_error;
+ goto __catch10_g_thread_error;
}
#line 60 "/home/jens/Source/shotwell/src/threads/Workers.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -553,8 +553,8 @@ void workers_enqueue (Workers* self, BackgroundJob* job) {
#line 554 "Workers.c"
}
}
- goto __finally8;
- __catch8_g_thread_error:
+ goto __finally10;
+ __catch10_g_thread_error:
{
GError* err = NULL;
GError* _tmp9_ = NULL;
@@ -573,7 +573,7 @@ void workers_enqueue (Workers* self, BackgroundJob* job) {
_g_error_free0 (err);
#line 575 "Workers.c"
}
- __finally8:
+ __finally10:
#line 59 "/home/jens/Source/shotwell/src/threads/Workers.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 59 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -687,7 +687,7 @@ gint workers_get_pending_job_count (Workers* self) {
return result;
#line 689 "Workers.c"
}
- __finally9:
+ __finally11:
{
GAsyncQueue* _tmp3_ = NULL;
#line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -752,7 +752,7 @@ static void workers_thread_start (Workers* self, void* ignored) {
empty = _tmp5_ == 0;
#line 754 "Workers.c"
}
- __finally10:
+ __finally12:
{
GAsyncQueue* _tmp6_ = NULL;
#line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala"