summaryrefslogtreecommitdiff
path: root/src/ThumbnailCache.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:43:08 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:43:08 +0200
commit2b3f22361da0c1d8e6ce70d71352821758186db7 (patch)
tree5d10633b47369b3aa52a05bf889ede0dbe5ee108 /src/ThumbnailCache.c
parent211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff)
parentdc6c76eb04dfe3d4262a1806808f0bc0bf523238 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/ThumbnailCache.c')
-rw-r--r--src/ThumbnailCache.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/ThumbnailCache.c b/src/ThumbnailCache.c
index 5ef8ed9..1d4933c 100644
--- a/src/ThumbnailCache.c
+++ b/src/ThumbnailCache.c
@@ -1802,7 +1802,7 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
#line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1805 "ThumbnailCache.c"
- goto __catch237_g_error;
+ goto __catch248_g_error;
}
#line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
_tmp9_ = _tmp4_;
@@ -1816,8 +1816,8 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
_g_object_unref0 (_tmp4_);
#line 1818 "ThumbnailCache.c"
}
- goto __finally237;
- __catch237_g_error:
+ goto __finally248;
+ __catch248_g_error:
{
GError* err = NULL;
GdkPixbuf* _tmp10_ = NULL;
@@ -1839,7 +1839,7 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
#line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
_g_error_free0 (err);
#line 1842 "ThumbnailCache.c"
- goto __finally237;
+ goto __finally248;
}
#line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
_tmp13_ = _tmp10_;
@@ -1855,7 +1855,7 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
_g_error_free0 (err);
#line 1857 "ThumbnailCache.c"
}
- __finally237:
+ __finally248:
#line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2390,11 +2390,11 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back
#line 423 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2393 "ThumbnailCache.c"
- goto __catch238_g_error;
+ goto __catch249_g_error;
}
}
- goto __finally238;
- __catch238_g_error:
+ goto __finally249;
+ __catch249_g_error:
{
GError* err = NULL;
ThumbnailCacheAsyncFetchJob* _tmp14_;
@@ -2418,7 +2418,7 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back
_g_error_free0 (err);
#line 2420 "ThumbnailCache.c"
}
- __finally238:
+ __finally249:
#line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2771,11 +2771,11 @@ static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* s
#line 494 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2774 "ThumbnailCache.c"
- goto __catch239_g_error;
+ goto __catch250_g_error;
}
}
- goto __finally239;
- __catch239_g_error:
+ goto __finally250;
+ __catch250_g_error:
{
GError* err = NULL;
GError* _tmp9_;
@@ -2802,7 +2802,7 @@ static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* s
_g_error_free0 (err);
#line 2804 "ThumbnailCache.c"
}
- __finally239:
+ __finally250:
#line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2946,11 +2946,11 @@ static void _thumbnail_cache_remove (ThumbnailCache* self, ThumbnailSource* sour
#line 529 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2949 "ThumbnailCache.c"
- goto __catch240_g_error;
+ goto __catch251_g_error;
}
}
- goto __finally240;
- __catch240_g_error:
+ goto __finally251;
+ __catch251_g_error:
{
GError* err = NULL;
#line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2961,7 +2961,7 @@ static void _thumbnail_cache_remove (ThumbnailCache* self, ThumbnailSource* sour
_g_error_free0 (err);
#line 2963 "ThumbnailCache.c"
}
- __finally240:
+ __finally251:
#line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4069,7 +4069,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
#line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 4071 "ThumbnailCache.c"
- goto __catch241_g_error;
+ goto __catch252_g_error;
}
#line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
_tmp6_ = _tmp1_;
@@ -4138,8 +4138,8 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
_g_object_unref0 (_tmp8_);
#line 4139 "ThumbnailCache.c"
}
- goto __finally241;
- __catch241_g_error:
+ goto __finally252;
+ __catch252_g_error:
{
GError* err = NULL;
GError* _tmp17_;
@@ -4158,11 +4158,11 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
#line 137 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 4160 "ThumbnailCache.c"
- goto __catch242_g_error;
+ goto __catch253_g_error;
}
}
- goto __finally242;
- __catch242_g_error:
+ goto __finally253;
+ __catch253_g_error:
{
GError* generr = NULL;
GError* _tmp18_;
@@ -4183,7 +4183,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
_g_error_free0 (generr);
#line 4184 "ThumbnailCache.c"
}
- __finally242:
+ __finally253:
#line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4215,7 +4215,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
_g_error_free0 (err);
#line 4216 "ThumbnailCache.c"
}
- __finally241:
+ __finally252:
#line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"