summaryrefslogtreecommitdiff
path: root/src/publishing/APIGlue.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:35:32 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:35:32 +0200
commite230b6f78546827521107be23797048482c8b193 (patch)
tree948c1e77382c484819ea399bba4edcdc19cc6bf0 /src/publishing/APIGlue.c
parent211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff)
parent49120f48474fc8fdc2448c75d961bc238213cfac (diff)
Update upstream source from tag 'upstream/0.28.2'
Update to upstream version '0.28.2' with Debian dir 811236a8e9a1308bf427065dcb6270419ff4f965
Diffstat (limited to 'src/publishing/APIGlue.c')
-rw-r--r--src/publishing/APIGlue.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c
index 04da15d..08c99ff 100644
--- a/src/publishing/APIGlue.c
+++ b/src/publishing/APIGlue.c
@@ -331,8 +331,8 @@ GType database_source_collection_get_type (void) G_GNUC_CONST;
GType container_source_collection_get_type (void) G_GNUC_CONST;
GType tag_source_collection_get_type (void) G_GNUC_CONST;
GeeSortedSet* tag_source_collection_fetch_sorted_for_source (TagSourceCollection* self, MediaSource* photo);
-static void _vala_array_add60 (gchar** * array, int* length, int* size, gchar* value);
-static gchar** _vala_array_dup22 (gchar** self, int length);
+static void _vala_array_add63 (gchar** * array, int* length, int* size, gchar* value);
+static gchar** _vala_array_dup20 (gchar** self, int length);
static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable_wrapper_real_get_media_type (SpitPublishingPublishable* base);
static GFile* publishing_glue_media_source_publishable_wrapper_real_get_serialized_file (SpitPublishingPublishable* base);
static GDateTime* publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time (SpitPublishingPublishable* base);
@@ -416,11 +416,11 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
#line 27 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 419 "APIGlue.c"
- goto __catch39_g_error;
+ goto __catch43_g_error;
}
}
- goto __finally39;
- __catch39_g_error:
+ goto __finally43;
+ __catch43_g_error:
{
GError* err = NULL;
GFile* _tmp5_;
@@ -444,7 +444,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
_g_error_free0 (err);
#line 446 "APIGlue.c"
}
- __finally39:
+ __finally43:
#line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -692,11 +692,11 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
#line 60 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 694 "APIGlue.c"
- goto __catch40_g_error;
+ goto __catch44_g_error;
}
}
- goto __finally40;
- __catch40_g_error:
+ goto __finally44;
+ __catch44_g_error:
{
GError* err = NULL;
LibraryPhoto* _tmp25_;
@@ -725,9 +725,9 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
#line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
_g_error_free0 (err);
#line 727 "APIGlue.c"
- goto __finally40;
+ goto __finally44;
}
- __finally40:
+ __finally44:
#line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -882,11 +882,11 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
#line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 883 "APIGlue.c"
- goto __catch41_g_error;
+ goto __catch45_g_error;
}
}
- goto __finally41;
- __catch41_g_error:
+ goto __finally45;
+ __catch45_g_error:
{
GError* err = NULL;
Video* _tmp56_;
@@ -915,9 +915,9 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
#line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
_g_error_free0 (err);
#line 916 "APIGlue.c"
- goto __finally41;
+ goto __finally45;
}
- __finally41:
+ __finally45:
#line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1065,7 +1065,7 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_param_st
}
-static void _vala_array_add60 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add63 (gchar** * array, int* length, int* size, gchar* value) {
#line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
if ((*length) == (*size)) {
#line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1082,7 +1082,7 @@ static void _vala_array_add60 (gchar** * array, int* length, int* size, gchar* v
}
-static gchar** _vala_array_dup22 (gchar** self, int length) {
+static gchar** _vala_array_dup20 (gchar** self, int length) {
gchar** result;
int i;
#line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1194,7 +1194,7 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
#line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
_tmp13_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
#line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
- _vala_array_add60 (&_result_, &_result__length1, &__result__size_, _tmp13_);
+ _vala_array_add63 (&_result_, &_result__length1, &__result__size_, _tmp13_);
#line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
_g_object_unref0 (tag);
#line 1198 "APIGlue.c"
@@ -1234,7 +1234,7 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
#line 1232 "APIGlue.c"
}
#line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
- _tmp17_ = (_tmp14_ != NULL) ? _vala_array_dup22 (_tmp14_, _tmp14__length1) : ((gpointer) _tmp14_);
+ _tmp17_ = (_tmp14_ != NULL) ? _vala_array_dup20 (_tmp14_, _tmp14__length1) : ((gpointer) _tmp14_);
#line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
_tmp17__length1 = _tmp14__length1;
#line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"