From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- src/publishing/APIGlue.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'src/publishing/APIGlue.c') 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" -- cgit v1.2.3 From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- src/publishing/APIGlue.c | 636 ++++++++++++++++++++++++++--------------------- 1 file changed, 354 insertions(+), 282 deletions(-) (limited to 'src/publishing/APIGlue.c') diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c index 08c99ff..66f79d9 100644 --- a/src/publishing/APIGlue.c +++ b/src/publishing/APIGlue.c @@ -1,4 +1,4 @@ -/* APIGlue.c generated by valac 0.36.6, the Vala compiler +/* APIGlue.c generated by valac 0.40.4, the Vala compiler * generated from APIGlue.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include "shotwell-plugin-dev-1.0.h" @@ -67,6 +68,11 @@ typedef struct _ThumbnailSourceClass ThumbnailSourceClass; typedef struct _MediaSource MediaSource; typedef struct _MediaSourceClass MediaSourceClass; +enum { + PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER_0_PROPERTY, + PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER_NUM_PROPERTIES +}; +static GParamSpec* publishing_glue_media_source_publishable_wrapper_properties[PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) @@ -277,11 +283,9 @@ GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; #define PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapperPrivate)) -enum { - PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER_DUMMY_PROPERTY -}; PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_new (MediaSource* to_wrap); -PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_construct (GType object_type, MediaSource* to_wrap); +PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_construct (GType object_type, + MediaSource* to_wrap); static void publishing_glue_media_source_publishable_wrapper_setup_parameters (PublishingGlueMediaSourcePublishableWrapper* self); void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMediaSourcePublishableWrapper* self); gchar* media_source_get_basename (MediaSource* self); @@ -291,7 +295,10 @@ GType event_source_get_type (void) G_GNUC_CONST; GType event_get_type (void) G_GNUC_CONST; Event* media_source_get_event (MediaSource* self); gchar* event_source_get_comment (EventSource* self); -GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (PublishingGlueMediaSourcePublishableWrapper* self, gint content_major_axis, gboolean strip_metadata, GError** error); +GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (PublishingGlueMediaSourcePublishableWrapper* self, + gint content_major_axis, + gboolean strip_metadata, + GError** error); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; @@ -304,83 +311,119 @@ Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); Scaling* scaling_dup (const Scaling* self); void scaling_free (Scaling* self); -void scaling_for_best_fit (gint pixels, gboolean scale_up, Scaling* result); +void scaling_for_best_fit (gint pixels, + gboolean scale_up, + Scaling* result); void scaling_for_original (Scaling* result); GType jpeg_quality_get_type (void) G_GNUC_CONST; GType photo_file_format_get_type (void) G_GNUC_CONST; -void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error); +void photo_export (Photo* self, + GFile* dest_file, + Scaling* scaling, + JpegQuality quality, + PhotoFileFormat export_format, + gboolean direct_copy_unmodified, + gboolean export_metadata, + GError** error); gchar* data_object_get_name (DataObject* self); GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; -void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); +void disassemble_filename (const gchar* basename, + gchar* * name, + gchar* * ext); GFile* media_source_get_file (MediaSource* self); -void video_export (Video* self, GFile* dest_file, GError** error); +void video_export (Video* self, + GFile* dest_file, + GError** error); static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishing_name (SpitPublishingPublishable* base); -static gchar* publishing_glue_media_source_publishable_wrapper_real_get_param_string (SpitPublishingPublishable* base, const gchar* name); -static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publishing_keywords (SpitPublishingPublishable* base, int* result_length1); +static gchar* publishing_glue_media_source_publishable_wrapper_real_get_param_string (SpitPublishingPublishable* base, + const gchar* name); +static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publishing_keywords (SpitPublishingPublishable* base, + int* result_length1); GType tag_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; 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_add63 (gchar** * array, int* length, int* size, gchar* value); -static gchar** _vala_array_dup20 (gchar** self, int length); +GeeSortedSet* tag_source_collection_fetch_sorted_for_source (TagSourceCollection* self, + MediaSource* photo); +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); time_t media_source_get_exposure_time (MediaSource* self); static void publishing_glue_media_source_publishable_wrapper_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 16 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return self ? g_object_ref (self) : NULL; -#line 349 "APIGlue.c" +#line 388 "APIGlue.c" } -PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_construct (GType object_type, MediaSource* to_wrap) { +PublishingGlueMediaSourcePublishableWrapper* +publishing_glue_media_source_publishable_wrapper_construct (GType object_type, + MediaSource* to_wrap) +{ PublishingGlueMediaSourcePublishableWrapper * self = NULL; MediaSource* _tmp0_; - MediaSource* _tmp1_; #line 15 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (to_wrap), NULL); #line 15 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" self = (PublishingGlueMediaSourcePublishableWrapper*) g_object_new (object_type, NULL); #line 16 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp0_ = to_wrap; -#line 16 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (to_wrap); #line 16 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (self->priv->wrapped); #line 16 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - self->priv->wrapped = _tmp1_; + self->priv->wrapped = _tmp0_; #line 17 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" publishing_glue_media_source_publishable_wrapper_setup_parameters (self); #line 15 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return self; -#line 373 "APIGlue.c" +#line 412 "APIGlue.c" } -PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_new (MediaSource* to_wrap) { +PublishingGlueMediaSourcePublishableWrapper* +publishing_glue_media_source_publishable_wrapper_new (MediaSource* to_wrap) +{ #line 15 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return publishing_glue_media_source_publishable_wrapper_construct (PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, to_wrap); -#line 380 "APIGlue.c" +#line 421 "APIGlue.c" } -void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMediaSourcePublishableWrapper* self) { +void +publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMediaSourcePublishableWrapper* self) +{ GFile* _tmp0_; GFile* _tmp1_; gchar* _tmp2_; @@ -394,7 +437,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe if (_tmp0_ == NULL) { #line 22 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return; -#line 398 "APIGlue.c" +#line 441 "APIGlue.c" } #line 24 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _tmp1_ = self->priv->serialized_file; @@ -406,7 +449,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe g_debug ("APIGlue.vala:24: cleaning up temporary publishing file '%s'.", _tmp3_); #line 24 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_free0 (_tmp3_); -#line 410 "APIGlue.c" +#line 453 "APIGlue.c" { GFile* _tmp4_; #line 27 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -415,7 +458,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe g_file_delete (_tmp4_, NULL, &_inner_error_); #line 27 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 419 "APIGlue.c" +#line 462 "APIGlue.c" goto __catch43_g_error; } } @@ -442,7 +485,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe _g_free0 (_tmp7_); #line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_error_free0 (err); -#line 446 "APIGlue.c" +#line 489 "APIGlue.c" } __finally43: #line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -453,17 +496,19 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe g_clear_error (&_inner_error_); #line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return; -#line 457 "APIGlue.c" +#line 500 "APIGlue.c" } #line 32 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (self->priv->serialized_file); #line 32 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" self->priv->serialized_file = NULL; -#line 463 "APIGlue.c" +#line 506 "APIGlue.c" } -static void publishing_glue_media_source_publishable_wrapper_setup_parameters (PublishingGlueMediaSourcePublishableWrapper* self) { +static void +publishing_glue_media_source_publishable_wrapper_setup_parameters (PublishingGlueMediaSourcePublishableWrapper* self) +{ GeeMap* _tmp0_; MediaSource* _tmp1_; gchar* _tmp2_; @@ -530,7 +575,7 @@ static void publishing_glue_media_source_publishable_wrapper_setup_parameters (P _g_object_unref0 (_tmp14_); #line 40 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" if (_tmp15_) { -#line 534 "APIGlue.c" +#line 579 "APIGlue.c" GeeMap* _tmp16_; MediaSource* _tmp17_; Event* _tmp18_; @@ -555,23 +600,28 @@ static void publishing_glue_media_source_publishable_wrapper_setup_parameters (P _g_free0 (_tmp21_); #line 41 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (_tmp19_); -#line 559 "APIGlue.c" +#line 604 "APIGlue.c" } else { GeeMap* _tmp22_; #line 43 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _tmp22_ = self->priv->param_string; #line 43 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" gee_map_set (_tmp22_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_EVENTCOMMENT, ""); -#line 566 "APIGlue.c" +#line 611 "APIGlue.c" } } -GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (PublishingGlueMediaSourcePublishableWrapper* self, gint content_major_axis, gboolean strip_metadata, GError** error) { +GFile* +publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (PublishingGlueMediaSourcePublishableWrapper* self, + gint content_major_axis, + gboolean strip_metadata, + GError** error) +{ GFile* result = NULL; MediaSource* _tmp0_; - GFile* _tmp63_; - GFile* _tmp64_; + GFile* _tmp60_; + GFile* _tmp61_; GError * _inner_error_ = NULL; #line 46 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" g_return_val_if_fail (PUBLISHING_GLUE_IS_MEDIA_SOURCE_PUBLISHABLE_WRAPPER (self), NULL); @@ -579,7 +629,7 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing _tmp0_ = self->priv->wrapped; #line 49 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO)) { -#line 583 "APIGlue.c" +#line 633 "APIGlue.c" LibraryPhoto* photo = NULL; MediaSource* _tmp1_; LibraryPhoto* _tmp2_; @@ -597,8 +647,8 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing GFile* _tmp13_; gchar* _tmp14_; gchar* _tmp15_; - GFile* _tmp30_; - GFile* _tmp31_; + GFile* _tmp27_; + GFile* _tmp28_; #line 50 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _tmp1_ = self->priv->wrapped; #line 50 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -646,52 +696,43 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing _g_free0 (_tmp15_); #line 55 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_free0 (_tmp12_); -#line 649 "APIGlue.c" +#line 699 "APIGlue.c" { Scaling _tmp16_ = {0}; - gint _tmp17_; Scaling scaling = {0}; - LibraryPhoto* _tmp21_; - GFile* _tmp22_; - Scaling _tmp23_; - gboolean _tmp24_; -#line 58 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp17_ = content_major_axis; + LibraryPhoto* _tmp19_; + GFile* _tmp20_; + Scaling _tmp21_; #line 58 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - if (_tmp17_ > 0) { -#line 662 "APIGlue.c" - gint _tmp18_; - Scaling _tmp19_ = {0}; -#line 59 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp18_ = content_major_axis; + if (content_major_axis > 0) { +#line 708 "APIGlue.c" + Scaling _tmp17_ = {0}; #line 59 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - scaling_for_best_fit (_tmp18_, FALSE, &_tmp19_); + scaling_for_best_fit (content_major_axis, FALSE, &_tmp17_); #line 59 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp16_ = _tmp19_; -#line 671 "APIGlue.c" + _tmp16_ = _tmp17_; +#line 714 "APIGlue.c" } else { - Scaling _tmp20_ = {0}; + Scaling _tmp18_ = {0}; #line 59 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - scaling_for_original (&_tmp20_); + scaling_for_original (&_tmp18_); #line 59 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp16_ = _tmp20_; -#line 678 "APIGlue.c" + _tmp16_ = _tmp18_; +#line 721 "APIGlue.c" } #line 58 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" scaling = _tmp16_; #line 60 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp21_ = photo; + _tmp19_ = photo; #line 60 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp22_ = to_file; + _tmp20_ = to_file; #line 60 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp23_ = scaling; + _tmp21_ = scaling; #line 60 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp24_ = strip_metadata; -#line 60 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PHOTO, Photo), _tmp22_, &_tmp23_, JPEG_QUALITY_HIGH, PHOTO_FILE_FORMAT_JFIF, FALSE, !_tmp24_, &_inner_error_); + photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PHOTO, Photo), _tmp20_, &_tmp21_, JPEG_QUALITY_HIGH, PHOTO_FILE_FORMAT_JFIF, FALSE, !strip_metadata, &_inner_error_); #line 60 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 694 "APIGlue.c" +#line 735 "APIGlue.c" goto __catch44_g_error; } } @@ -699,32 +740,32 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing __catch44_g_error: { GError* err = NULL; - LibraryPhoto* _tmp25_; - gchar* _tmp26_; - gchar* _tmp27_; - GError* _tmp28_; - GError* _tmp29_; + LibraryPhoto* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + GError* _tmp25_; + GError* _tmp26_; #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" err = _inner_error_; #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _inner_error_ = NULL; #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp25_ = photo; + _tmp22_ = photo; #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp26_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject)); + _tmp23_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject)); #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp27_ = _tmp26_; + _tmp24_ = _tmp23_; #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp28_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, "unable to serialize photo '%s' for publishing.", _tmp27_); + _tmp25_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, "unable to serialize photo '%s' for publishing.", _tmp24_); #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp29_ = _tmp28_; + _tmp26_ = _tmp25_; #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _g_free0 (_tmp27_); + _g_free0 (_tmp24_); #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _inner_error_ = _tmp29_; + _inner_error_ = _tmp26_; #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_error_free0 (err); -#line 727 "APIGlue.c" +#line 768 "APIGlue.c" goto __finally44; } __finally44: @@ -740,7 +781,7 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing _g_object_unref0 (photo); #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return NULL; -#line 743 "APIGlue.c" +#line 784 "APIGlue.c" } else { #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (to_file); @@ -752,136 +793,136 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing g_clear_error (&_inner_error_); #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return NULL; -#line 755 "APIGlue.c" +#line 796 "APIGlue.c" } } #line 66 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp30_ = to_file; + _tmp27_ = to_file; #line 66 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp31_ = _g_object_ref0 (_tmp30_); + _tmp28_ = _g_object_ref0 (_tmp27_); #line 66 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (self->priv->serialized_file); #line 66 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - self->priv->serialized_file = _tmp31_; + self->priv->serialized_file = _tmp28_; #line 49 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (to_file); #line 49 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (photo); -#line 770 "APIGlue.c" +#line 811 "APIGlue.c" } else { - MediaSource* _tmp32_; + MediaSource* _tmp29_; #line 67 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp32_ = self->priv->wrapped; + _tmp29_ = self->priv->wrapped; #line 67 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, TYPE_VIDEO)) { -#line 777 "APIGlue.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, TYPE_VIDEO)) { +#line 818 "APIGlue.c" Video* video = NULL; - MediaSource* _tmp33_; - Video* _tmp34_; + MediaSource* _tmp30_; + Video* _tmp31_; gchar* basename = NULL; gchar* extension = NULL; - Video* _tmp35_; - GFile* _tmp36_; - GFile* _tmp37_; - gchar* _tmp38_; - gchar* _tmp39_; - gchar* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; + Video* _tmp32_; + GFile* _tmp33_; + GFile* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_ = NULL; + gchar* _tmp38_ = NULL; GFile* to_file = NULL; - gint _tmp42_; - const gchar* _tmp43_; - gchar* _tmp44_; - gchar* _tmp45_; - GFile* _tmp46_; - GFile* _tmp47_; - Video* _tmp48_; + gint _tmp39_; + const gchar* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; + GFile* _tmp43_; + GFile* _tmp44_; + Video* _tmp45_; + gchar* _tmp46_; + gchar* _tmp47_; + GFile* _tmp48_; gchar* _tmp49_; gchar* _tmp50_; - GFile* _tmp51_; - gchar* _tmp52_; - gchar* _tmp53_; - GFile* _tmp61_; - GFile* _tmp62_; + GFile* _tmp58_; + GFile* _tmp59_; #line 68 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp33_ = self->priv->wrapped; + _tmp30_ = self->priv->wrapped; #line 68 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp34_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_VIDEO, Video)); + _tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_VIDEO, Video)); #line 68 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - video = _tmp34_; + video = _tmp31_; #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp35_ = video; + _tmp32_ = video; #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp36_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp33_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MEDIA_SOURCE, MediaSource)); #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp37_ = _tmp36_; + _tmp34_ = _tmp33_; #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp38_ = g_file_get_basename (_tmp37_); + _tmp35_ = g_file_get_basename (_tmp34_); #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp39_ = _tmp38_; + _tmp36_ = _tmp35_; #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - disassemble_filename (_tmp39_, &_tmp40_, &_tmp41_); + disassemble_filename (_tmp36_, &_tmp37_, &_tmp38_); #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_free0 (basename); #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - basename = _tmp40_; + basename = _tmp37_; #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_free0 (extension); #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - extension = _tmp41_; + extension = _tmp38_; #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _g_free0 (_tmp39_); + _g_free0 (_tmp36_); #line 72 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _g_object_unref0 (_tmp37_); + _g_object_unref0 (_tmp34_); #line 74 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp42_ = publishing_glue_media_source_publishable_wrapper_name_ticker; + _tmp39_ = publishing_glue_media_source_publishable_wrapper_name_ticker; #line 74 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - publishing_glue_media_source_publishable_wrapper_name_ticker = _tmp42_ + 1; + publishing_glue_media_source_publishable_wrapper_name_ticker = _tmp39_ + 1; #line 74 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp43_ = extension; + _tmp40_ = extension; #line 74 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp44_ = g_strdup_printf ("publishing-%d.%s", _tmp42_, _tmp43_); + _tmp41_ = g_strdup_printf ("publishing-%d.%s", _tmp39_, _tmp40_); #line 74 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp45_ = _tmp44_; + _tmp42_ = _tmp41_; #line 74 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp46_ = g_file_new_for_path (_tmp45_); + _tmp43_ = g_file_new_for_path (_tmp42_); #line 74 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp47_ = _tmp46_; + _tmp44_ = _tmp43_; #line 74 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _g_free0 (_tmp45_); + _g_free0 (_tmp42_); #line 74 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - to_file = _tmp47_; + to_file = _tmp44_; #line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp48_ = video; + _tmp45_ = video; #line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp49_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_DATA_SOURCE, DataSource)); + _tmp46_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_DATA_SOURCE, DataSource)); #line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp50_ = _tmp49_; + _tmp47_ = _tmp46_; #line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp51_ = to_file; + _tmp48_ = to_file; #line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp52_ = g_file_get_path (_tmp51_); + _tmp49_ = g_file_get_path (_tmp48_); #line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp53_ = _tmp52_; + _tmp50_ = _tmp49_; #line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" g_debug ("APIGlue.vala:77: writing video '%s' to temporary file '%s' for publish" \ -"ing.", _tmp50_, _tmp53_); -#line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _g_free0 (_tmp53_); +"ing.", _tmp47_, _tmp50_); #line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_free0 (_tmp50_); -#line 871 "APIGlue.c" +#line 77 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" + _g_free0 (_tmp47_); +#line 912 "APIGlue.c" { - Video* _tmp54_; - GFile* _tmp55_; + Video* _tmp51_; + GFile* _tmp52_; #line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp54_ = video; + _tmp51_ = video; #line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp55_ = to_file; + _tmp52_ = to_file; #line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - video_export (_tmp54_, _tmp55_, &_inner_error_); + video_export (_tmp51_, _tmp52_, &_inner_error_); #line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 883 "APIGlue.c" +#line 924 "APIGlue.c" goto __catch45_g_error; } } @@ -889,32 +930,32 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing __catch45_g_error: { GError* err = NULL; - Video* _tmp56_; - gchar* _tmp57_; - gchar* _tmp58_; - GError* _tmp59_; - GError* _tmp60_; + Video* _tmp53_; + gchar* _tmp54_; + gchar* _tmp55_; + GError* _tmp56_; + GError* _tmp57_; #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" err = _inner_error_; #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _inner_error_ = NULL; #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp56_ = video; + _tmp53_ = video; #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp57_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_DATA_OBJECT, DataObject)); + _tmp54_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_DATA_OBJECT, DataObject)); #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp58_ = _tmp57_; + _tmp55_ = _tmp54_; #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp59_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, "unable to serialize video '%s' for publishing.", _tmp58_); + _tmp56_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, "unable to serialize video '%s' for publishing.", _tmp55_); #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp60_ = _tmp59_; + _tmp57_ = _tmp56_; #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _g_free0 (_tmp58_); + _g_free0 (_tmp55_); #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _inner_error_ = _tmp60_; + _inner_error_ = _tmp57_; #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_error_free0 (err); -#line 916 "APIGlue.c" +#line 957 "APIGlue.c" goto __finally45; } __finally45: @@ -934,7 +975,7 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing _g_object_unref0 (video); #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return NULL; -#line 936 "APIGlue.c" +#line 977 "APIGlue.c" } else { #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (to_file); @@ -950,17 +991,17 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing g_clear_error (&_inner_error_); #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return NULL; -#line 952 "APIGlue.c" +#line 993 "APIGlue.c" } } #line 86 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp61_ = to_file; + _tmp58_ = to_file; #line 86 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp62_ = _g_object_ref0 (_tmp61_); + _tmp59_ = _g_object_ref0 (_tmp58_); #line 86 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (self->priv->serialized_file); #line 86 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - self->priv->serialized_file = _tmp62_; + self->priv->serialized_file = _tmp59_; #line 67 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (to_file); #line 67 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -969,27 +1010,29 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing _g_free0 (basename); #line 67 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (video); -#line 971 "APIGlue.c" +#line 1012 "APIGlue.c" } else { #line 88 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" g_error ("APIGlue.vala:88: MediaSourcePublishableWrapper.serialize_for_publishin" \ "g( ): unknown media type."); -#line 975 "APIGlue.c" +#line 1016 "APIGlue.c" } } #line 91 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp63_ = self->priv->serialized_file; + _tmp60_ = self->priv->serialized_file; #line 91 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp64_ = _g_object_ref0 (_tmp63_); + _tmp61_ = _g_object_ref0 (_tmp60_); #line 91 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - result = _tmp64_; + result = _tmp61_; #line 91 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 986 "APIGlue.c" +#line 1027 "APIGlue.c" } -static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishing_name (SpitPublishingPublishable* base) { +static gchar* +publishing_glue_media_source_publishable_wrapper_real_get_publishing_name (SpitPublishingPublishable* base) +{ PublishingGlueMediaSourcePublishableWrapper * self; gchar* result = NULL; gchar* _tmp0_ = NULL; @@ -1011,7 +1054,7 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishi _g_free0 (_tmp3_); #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" if (_tmp4_) { -#line 1012 "APIGlue.c" +#line 1055 "APIGlue.c" MediaSource* _tmp5_; gchar* _tmp6_; #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -1022,7 +1065,7 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishi _g_free0 (_tmp0_); #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _tmp0_ = _tmp6_; -#line 1023 "APIGlue.c" +#line 1066 "APIGlue.c" } else { gchar* _tmp7_; #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -1031,22 +1074,24 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishi _g_free0 (_tmp0_); #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _tmp0_ = _tmp7_; -#line 1032 "APIGlue.c" +#line 1075 "APIGlue.c" } #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" result = _tmp0_; #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 1038 "APIGlue.c" +#line 1081 "APIGlue.c" } -static gchar* publishing_glue_media_source_publishable_wrapper_real_get_param_string (SpitPublishingPublishable* base, const gchar* name) { +static gchar* +publishing_glue_media_source_publishable_wrapper_real_get_param_string (SpitPublishingPublishable* base, + const gchar* name) +{ PublishingGlueMediaSourcePublishableWrapper * self; gchar* result = NULL; GeeMap* _tmp0_; - const gchar* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 98 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper); #line 98 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -1054,56 +1099,65 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_param_st #line 99 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _tmp0_ = self->priv->param_string; #line 99 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp1_ = name; + _tmp1_ = gee_map_get (_tmp0_, name); #line 99 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp2_ = gee_map_get (_tmp0_, _tmp1_); -#line 99 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - result = (gchar*) _tmp2_; + result = (gchar*) _tmp1_; #line 99 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 1062 "APIGlue.c" +#line 1105 "APIGlue.c" } -static void _vala_array_add63 (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" *size = (*size) ? (2 * (*size)) : 4; #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 1073 "APIGlue.c" +#line 1121 "APIGlue.c" } #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" (*array)[(*length)++] = value; #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" (*array)[*length] = NULL; -#line 1079 "APIGlue.c" +#line 1127 "APIGlue.c" } -static gchar** _vala_array_dup20 (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" result = g_new0 (gchar*, length + 1); #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" for (i = 0; i < length; i++) { -#line 1090 "APIGlue.c" +#line 1141 "APIGlue.c" gchar* _tmp0_; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _tmp0_ = g_strdup (self[i]); #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" result[i] = _tmp0_; -#line 1096 "APIGlue.c" +#line 1147 "APIGlue.c" } #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 1100 "APIGlue.c" +#line 1151 "APIGlue.c" } -static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publishing_keywords (SpitPublishingPublishable* base, int* result_length1) { +static gchar** +publishing_glue_media_source_publishable_wrapper_real_get_publishing_keywords (SpitPublishingPublishable* base, + int* result_length1) +{ PublishingGlueMediaSourcePublishableWrapper * self; gchar** result = NULL; gchar** _result_ = NULL; @@ -1115,15 +1169,15 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish MediaSource* _tmp2_; GeeSortedSet* _tmp3_; GeeCollection* _tmp4_; - gchar** _tmp14_ = NULL; - gint _tmp14__length1 = 0; - gint __tmp14__size_ = 0; - gchar** _tmp15_; - gint _tmp15__length1; + gchar** _tmp13_ = NULL; + gint _tmp13__length1 = 0; + gint __tmp13__size_ = 0; + gchar** _tmp14_; + gint _tmp14__length1; + gchar** _tmp16_; + gint _tmp16__length1; gchar** _tmp17_; gint _tmp17__length1; - gchar** _tmp18_; - gint _tmp18__length1; #line 102 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper); #line 103 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -1146,7 +1200,7 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish _tmp4_ = tagset; #line 106 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" if (_tmp4_ != NULL) { -#line 1147 "APIGlue.c" +#line 1201 "APIGlue.c" { GeeIterator* _tag_it = NULL; GeeCollection* _tmp5_; @@ -1159,107 +1213,106 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish _tag_it = _tmp6_; #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" while (TRUE) { -#line 1160 "APIGlue.c" +#line 1214 "APIGlue.c" GeeIterator* _tmp7_; - gboolean _tmp8_; Tag* tag = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; - gchar** _tmp11_; - gint _tmp11__length1; - Tag* _tmp12_; - gchar* _tmp13_; + GeeIterator* _tmp8_; + gpointer _tmp9_; + gchar** _tmp10_; + gint _tmp10__length1; + Tag* _tmp11_; + gchar* _tmp12_; #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _tmp7_ = _tag_it; #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp8_ = gee_iterator_next (_tmp7_); -#line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp7_)) { #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" break; -#line 1178 "APIGlue.c" +#line 1229 "APIGlue.c" } #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp9_ = _tag_it; + _tmp8_ = _tag_it; #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp9_ = gee_iterator_get (_tmp8_); #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - tag = (Tag*) _tmp10_; + tag = (Tag*) _tmp9_; #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp11_ = _result_; + _tmp10_ = _result_; #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp11__length1 = _result__length1; + _tmp10__length1 = _result__length1; #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp12_ = tag; + _tmp11_ = tag; #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)); + _tmp12_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _vala_array_add63 (&_result_, &_result__length1, &__result__size_, _tmp13_); + _vala_array_add63 (&_result_, &_result__length1, &__result__size_, _tmp12_); #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (tag); -#line 1198 "APIGlue.c" +#line 1249 "APIGlue.c" } #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (_tag_it); -#line 1202 "APIGlue.c" +#line 1253 "APIGlue.c" } } #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp15_ = _result_; + _tmp14_ = _result_; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp15__length1 = _result__length1; + _tmp14__length1 = _result__length1; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - if (_tmp15__length1 > 0) { -#line 1211 "APIGlue.c" - gchar** _tmp16_; - gint _tmp16__length1; + if (_tmp14__length1 > 0) { +#line 1262 "APIGlue.c" + gchar** _tmp15_; + gint _tmp15__length1; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp16_ = _result_; + _tmp15_ = _result_; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp16__length1 = _result__length1; + _tmp15__length1 = _result__length1; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp14_ = _tmp16_; + _tmp13_ = _tmp15_; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp14__length1 = _tmp16__length1; + _tmp13__length1 = _tmp15__length1; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - __tmp14__size_ = _tmp14__length1; -#line 1224 "APIGlue.c" + __tmp13__size_ = _tmp13__length1; +#line 1275 "APIGlue.c" } else { #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp14_ = NULL; + _tmp13_ = NULL; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp14__length1 = 0; + _tmp13__length1 = 0; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - __tmp14__size_ = _tmp14__length1; -#line 1232 "APIGlue.c" + __tmp13__size_ = _tmp13__length1; +#line 1283 "APIGlue.c" } #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp17_ = (_tmp14_ != NULL) ? _vala_array_dup20 (_tmp14_, _tmp14__length1) : ((gpointer) _tmp14_); + _tmp16_ = (_tmp13_ != NULL) ? _vala_array_dup20 (_tmp13_, _tmp13__length1) : ((gpointer) _tmp13_); #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp17__length1 = _tmp14__length1; + _tmp16__length1 = _tmp13__length1; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp18__length1 = _tmp17__length1; + _tmp17__length1 = _tmp16__length1; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" if (result_length1) { #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - *result_length1 = _tmp18__length1; -#line 1246 "APIGlue.c" + *result_length1 = _tmp17__length1; +#line 1297 "APIGlue.c" } #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - result = _tmp18_; + result = _tmp17_; #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _g_object_unref0 (tagset); #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) g_free), NULL); #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 1256 "APIGlue.c" +#line 1307 "APIGlue.c" } -static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable_wrapper_real_get_media_type (SpitPublishingPublishable* base) { +static SpitPublishingPublisherMediaType +publishing_glue_media_source_publishable_wrapper_real_get_media_type (SpitPublishingPublishable* base) +{ PublishingGlueMediaSourcePublishableWrapper * self; SpitPublishingPublisherMediaType result = 0; MediaSource* _tmp0_; @@ -1273,7 +1326,7 @@ static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO; #line 117 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 1274 "APIGlue.c" +#line 1327 "APIGlue.c" } else { MediaSource* _tmp1_; #line 118 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -1284,19 +1337,21 @@ static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO; #line 119 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 1285 "APIGlue.c" +#line 1338 "APIGlue.c" } else { #line 121 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_NONE; #line 121 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 1291 "APIGlue.c" +#line 1344 "APIGlue.c" } } } -static GFile* publishing_glue_media_source_publishable_wrapper_real_get_serialized_file (SpitPublishingPublishable* base) { +static GFile* +publishing_glue_media_source_publishable_wrapper_real_get_serialized_file (SpitPublishingPublishable* base) +{ PublishingGlueMediaSourcePublishableWrapper * self; GFile* result = NULL; GFile* _tmp0_; @@ -1311,44 +1366,47 @@ static GFile* publishing_glue_media_source_publishable_wrapper_real_get_serializ result = _tmp1_; #line 125 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 1312 "APIGlue.c" +#line 1367 "APIGlue.c" } -static GDateTime* publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time (SpitPublishingPublishable* base) { +static GDateTime* +publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time (SpitPublishingPublishable* base) +{ PublishingGlueMediaSourcePublishableWrapper * self; GDateTime* result = NULL; MediaSource* _tmp0_; - time_t _tmp1_; - GDateTime* _tmp2_; + GDateTime* _tmp1_; #line 128 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper); #line 129 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" _tmp0_ = self->priv->wrapped; #line 129 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp1_ = media_source_get_exposure_time (_tmp0_); -#line 129 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - _tmp2_ = g_date_time_new_from_unix_local ((gint64) _tmp1_); + _tmp1_ = g_date_time_new_from_unix_local ((gint64) media_source_get_exposure_time (_tmp0_)); #line 129 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" - result = _tmp2_; + result = _tmp1_; #line 129 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" return result; -#line 1334 "APIGlue.c" +#line 1388 "APIGlue.c" } -static void publishing_glue_media_source_publishable_wrapper_class_init (PublishingGlueMediaSourcePublishableWrapperClass * klass) { +static void +publishing_glue_media_source_publishable_wrapper_class_init (PublishingGlueMediaSourcePublishableWrapperClass * klass) +{ #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" publishing_glue_media_source_publishable_wrapper_parent_class = g_type_class_peek_parent (klass); #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" g_type_class_add_private (klass, sizeof (PublishingGlueMediaSourcePublishableWrapperPrivate)); #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" G_OBJECT_CLASS (klass)->finalize = publishing_glue_media_source_publishable_wrapper_finalize; -#line 1345 "APIGlue.c" +#line 1401 "APIGlue.c" } -static void publishing_glue_media_source_publishable_wrapper_spit_publishing_publishable_interface_init (SpitPublishingPublishableIface * iface) { +static void +publishing_glue_media_source_publishable_wrapper_spit_publishing_publishable_interface_init (SpitPublishingPublishableIface * iface) +{ #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" publishing_glue_media_source_publishable_wrapper_spit_publishing_publishable_parent_iface = g_type_interface_peek_parent (iface); #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" @@ -1363,11 +1421,13 @@ static void publishing_glue_media_source_publishable_wrapper_spit_publishing_pub iface->get_serialized_file = (GFile* (*) (SpitPublishingPublishable *)) publishing_glue_media_source_publishable_wrapper_real_get_serialized_file; #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" iface->get_exposure_date_time = (GDateTime* (*) (SpitPublishingPublishable *)) publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time; -#line 1364 "APIGlue.c" +#line 1422 "APIGlue.c" } -static void publishing_glue_media_source_publishable_wrapper_instance_init (PublishingGlueMediaSourcePublishableWrapper * self) { +static void +publishing_glue_media_source_publishable_wrapper_instance_init (PublishingGlueMediaSourcePublishableWrapper * self) +{ GeeHashMap* _tmp0_; #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" self->priv = PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER_GET_PRIVATE (self); @@ -1377,11 +1437,13 @@ static void publishing_glue_media_source_publishable_wrapper_instance_init (Publ _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 13 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" self->priv->param_string = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap); -#line 1378 "APIGlue.c" +#line 1438 "APIGlue.c" } -static void publishing_glue_media_source_publishable_wrapper_finalize (GObject * obj) { +static void +publishing_glue_media_source_publishable_wrapper_finalize (GObject * obj) +{ PublishingGlueMediaSourcePublishableWrapper * self; #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper); @@ -1393,11 +1455,13 @@ static void publishing_glue_media_source_publishable_wrapper_finalize (GObject * _g_object_unref0 (self->priv->param_string); #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala" G_OBJECT_CLASS (publishing_glue_media_source_publishable_wrapper_parent_class)->finalize (obj); -#line 1394 "APIGlue.c" +#line 1456 "APIGlue.c" } -GType publishing_glue_media_source_publishable_wrapper_get_type (void) { +GType +publishing_glue_media_source_publishable_wrapper_get_type (void) +{ static volatile gsize publishing_glue_media_source_publishable_wrapper_type_id__volatile = 0; if (g_once_init_enter (&publishing_glue_media_source_publishable_wrapper_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingGlueMediaSourcePublishableWrapperClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_glue_media_source_publishable_wrapper_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGlueMediaSourcePublishableWrapper), 0, (GInstanceInitFunc) publishing_glue_media_source_publishable_wrapper_instance_init, NULL }; @@ -1411,7 +1475,11 @@ GType publishing_glue_media_source_publishable_wrapper_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -1423,7 +1491,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -- cgit v1.2.3