From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- .../shotwell-publishing-extras.c | 135 ++++++++++----------- 1 file changed, 66 insertions(+), 69 deletions(-) (limited to 'plugins/shotwell-publishing-extras/shotwell-publishing-extras.c') diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c index eb4ec9e..04cf9d3 100644 --- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c +++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c @@ -1,4 +1,4 @@ -/* shotwell-publishing-extras.c generated by valac 0.34.7, the Vala compiler +/* shotwell-publishing-extras.c generated by valac 0.36.6, the Vala compiler * generated from shotwell-publishing-extras.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -85,7 +85,7 @@ struct _ShotwellPublishingExtraServicesPrivate { static gpointer shotwell_publishing_extra_services_parent_class = NULL; -static SpitModuleIface* shotwell_publishing_extra_services_spit_module_parent_iface = NULL; +static SpitModuleIface * shotwell_publishing_extra_services_spit_module_parent_iface = NULL; GType shotwell_publishing_extra_services_get_type (void) G_GNUC_CONST; #define SHOTWELL_PUBLISHING_EXTRA_SERVICES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServicesPrivate)) @@ -97,30 +97,30 @@ ShotwellPublishingExtraServices* shotwell_publishing_extra_services_construct (G YandexService* yandex_service_new (void); YandexService* yandex_service_construct (GType object_type); GType yandex_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add14 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add14 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); TumblrService* tumblr_service_new (GFile* resource_directory); TumblrService* tumblr_service_construct (GType object_type, GFile* resource_directory); GType tumblr_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add15 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add15 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); RajceService* rajce_service_new (GFile* resource_directory); RajceService* rajce_service_construct (GType object_type, GFile* resource_directory); GType rajce_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add16 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add16 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); Gallery3Service* gallery3_service_new (GFile* resource_directory); Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_directory); GType gallery3_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add17 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add17 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); static const gchar* shotwell_publishing_extra_services_real_get_module_name (SpitModule* base); static const gchar* shotwell_publishing_extra_services_real_get_version (SpitModule* base); static const gchar* shotwell_publishing_extra_services_real_get_id (SpitModule* base); static SpitPluggable** shotwell_publishing_extra_services_real_get_pluggables (SpitModule* base, int* result_length1); -static void shotwell_publishing_extra_services_finalize (GObject* obj); +static void shotwell_publishing_extra_services_finalize (GObject * obj); SpitModule* spit_entry_point (SpitEntryPointParams* params); 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_add14 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add14 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" if ((*length) == (*size)) { #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" @@ -137,7 +137,7 @@ static void _vala_array_add14 (SpitPluggable*** array, int* length, int* size, S } -static void _vala_array_add15 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add15 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" if ((*length) == (*size)) { #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" @@ -154,7 +154,7 @@ static void _vala_array_add15 (SpitPluggable*** array, int* length, int* size, S } -static void _vala_array_add16 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add16 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" if ((*length) == (*size)) { #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" @@ -171,7 +171,7 @@ static void _vala_array_add16 (SpitPluggable*** array, int* length, int* size, S } -static void _vala_array_add17 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add17 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" if ((*length) == (*size)) { #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" @@ -190,27 +190,27 @@ static void _vala_array_add17 (SpitPluggable*** array, int* length, int* size, S ShotwellPublishingExtraServices* shotwell_publishing_extra_services_construct (GType object_type, GFile* module_file) { ShotwellPublishingExtraServices * self = NULL; - SpitPluggable** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - YandexService* _tmp1_ = NULL; - SpitPluggable** _tmp2_ = NULL; - gint _tmp2__length1 = 0; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - TumblrService* _tmp6_ = NULL; - SpitPluggable** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - GFile* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - RajceService* _tmp11_ = NULL; - SpitPluggable** _tmp12_ = NULL; - gint _tmp12__length1 = 0; - GFile* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; - GFile* _tmp15_ = NULL; - Gallery3Service* _tmp16_ = NULL; + SpitPluggable** _tmp0_; + gint _tmp0__length1; + YandexService* _tmp1_; + SpitPluggable** _tmp2_; + gint _tmp2__length1; + GFile* _tmp3_; + GFile* _tmp4_; + GFile* _tmp5_; + TumblrService* _tmp6_; + SpitPluggable** _tmp7_; + gint _tmp7__length1; + GFile* _tmp8_; + GFile* _tmp9_; + GFile* _tmp10_; + RajceService* _tmp11_; + SpitPluggable** _tmp12_; + gint _tmp12__length1; + GFile* _tmp13_; + GFile* _tmp14_; + GFile* _tmp15_; + Gallery3Service* _tmp16_; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" g_return_val_if_fail (G_IS_FILE (module_file), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" @@ -287,16 +287,13 @@ ShotwellPublishingExtraServices* shotwell_publishing_extra_services_new (GFile* static const gchar* shotwell_publishing_extra_services_real_get_module_name (SpitModule* base) { ShotwellPublishingExtraServices * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 30 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServices); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp0_ = _ ("Shotwell Extra Publishing Services"); -#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - result = _tmp0_; + result = _ ("Shotwell Extra Publishing Services"); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" return result; -#line 300 "shotwell-publishing-extras.c" +#line 297 "shotwell-publishing-extras.c" } @@ -309,7 +306,7 @@ static const gchar* shotwell_publishing_extra_services_real_get_version (SpitMod result = _VERSION; #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" return result; -#line 313 "shotwell-publishing-extras.c" +#line 310 "shotwell-publishing-extras.c" } @@ -322,17 +319,17 @@ static const gchar* shotwell_publishing_extra_services_real_get_id (SpitModule* result = "org.yorba.shotwell.publishing.extras"; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" return result; -#line 326 "shotwell-publishing-extras.c" +#line 323 "shotwell-publishing-extras.c" } static SpitPluggable** shotwell_publishing_extra_services_real_get_pluggables (SpitModule* base, int* result_length1) { ShotwellPublishingExtraServices * self; SpitPluggable** result = NULL; - SpitPluggable** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - SpitPluggable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + SpitPluggable** _tmp0_; + gint _tmp0__length1; + SpitPluggable** _tmp1_; + gint _tmp1__length1; #line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServices); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" @@ -347,13 +344,13 @@ static SpitPluggable** shotwell_publishing_extra_services_real_get_pluggables (S if (result_length1) { #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" *result_length1 = _tmp1__length1; -#line 351 "shotwell-publishing-extras.c" +#line 348 "shotwell-publishing-extras.c" } #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" result = _tmp1_; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" return result; -#line 357 "shotwell-publishing-extras.c" +#line 354 "shotwell-publishing-extras.c" } @@ -364,7 +361,7 @@ static void shotwell_publishing_extra_services_class_init (ShotwellPublishingExt g_type_class_add_private (klass, sizeof (ShotwellPublishingExtraServicesPrivate)); #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" G_OBJECT_CLASS (klass)->finalize = shotwell_publishing_extra_services_finalize; -#line 368 "shotwell-publishing-extras.c" +#line 365 "shotwell-publishing-extras.c" } @@ -372,19 +369,19 @@ static void shotwell_publishing_extra_services_spit_module_interface_init (SpitM #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" shotwell_publishing_extra_services_spit_module_parent_iface = g_type_interface_peek_parent (iface); #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - iface->get_module_name = (const gchar* (*)(SpitModule*)) shotwell_publishing_extra_services_real_get_module_name; + iface->get_module_name = (const gchar* (*) (SpitModule *)) shotwell_publishing_extra_services_real_get_module_name; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - iface->get_version = (const gchar* (*)(SpitModule*)) shotwell_publishing_extra_services_real_get_version; + iface->get_version = (const gchar* (*) (SpitModule *)) shotwell_publishing_extra_services_real_get_version; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - iface->get_id = (const gchar* (*)(SpitModule*)) shotwell_publishing_extra_services_real_get_id; + iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_publishing_extra_services_real_get_id; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - iface->get_pluggables = (SpitPluggable** (*)(SpitModule*, int*)) shotwell_publishing_extra_services_real_get_pluggables; -#line 383 "shotwell-publishing-extras.c" + iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_publishing_extra_services_real_get_pluggables; +#line 380 "shotwell-publishing-extras.c" } static void shotwell_publishing_extra_services_instance_init (ShotwellPublishingExtraServices * self) { - SpitPluggable** _tmp0_ = NULL; + SpitPluggable** _tmp0_; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" self->priv = SHOTWELL_PUBLISHING_EXTRA_SERVICES_GET_PRIVATE (self); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" @@ -395,11 +392,11 @@ static void shotwell_publishing_extra_services_instance_init (ShotwellPublishing self->priv->pluggables_length1 = 0; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" self->priv->_pluggables_size_ = self->priv->pluggables_length1; -#line 399 "shotwell-publishing-extras.c" +#line 396 "shotwell-publishing-extras.c" } -static void shotwell_publishing_extra_services_finalize (GObject* obj) { +static void shotwell_publishing_extra_services_finalize (GObject * obj) { ShotwellPublishingExtraServices * self; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServices); @@ -407,7 +404,7 @@ static void shotwell_publishing_extra_services_finalize (GObject* obj) { self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL); #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" G_OBJECT_CLASS (shotwell_publishing_extra_services_parent_class)->finalize (obj); -#line 411 "shotwell-publishing-extras.c" +#line 408 "shotwell-publishing-extras.c" } @@ -427,14 +424,14 @@ GType shotwell_publishing_extra_services_get_type (void) { SpitModule* spit_entry_point (SpitEntryPointParams* params) { SpitModule* result = NULL; - SpitEntryPointParams* _tmp0_ = NULL; - gint _tmp1_ = 0; - SpitEntryPointParams* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + SpitEntryPointParams* _tmp0_; + gint _tmp1_; + SpitEntryPointParams* _tmp2_; + gint _tmp3_; + gint _tmp4_; ShotwellPublishingExtraServices* _tmp5_ = NULL; - SpitEntryPointParams* _tmp6_ = NULL; - gint _tmp7_ = 0; + SpitEntryPointParams* _tmp6_; + gint _tmp7_; #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp0_ = params; #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" @@ -453,10 +450,10 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) { _tmp7_ = (*_tmp6_).module_spit_interface; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) { -#line 457 "shotwell-publishing-extras.c" - SpitEntryPointParams* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - ShotwellPublishingExtraServices* _tmp10_ = NULL; +#line 454 "shotwell-publishing-extras.c" + SpitEntryPointParams* _tmp8_; + GFile* _tmp9_; + ShotwellPublishingExtraServices* _tmp10_; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp8_ = params; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" @@ -467,19 +464,19 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) { _g_object_unref0 (_tmp5_); #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp5_ = _tmp10_; -#line 471 "shotwell-publishing-extras.c" +#line 468 "shotwell-publishing-extras.c" } else { #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _g_object_unref0 (_tmp5_); #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp5_ = NULL; -#line 477 "shotwell-publishing-extras.c" +#line 474 "shotwell-publishing-extras.c" } #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule); #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" return result; -#line 483 "shotwell-publishing-extras.c" +#line 480 "shotwell-publishing-extras.c" } -- cgit v1.2.3