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 --- plugins/shotwell-publishing/shotwell-publishing.c | 175 +++++++++++----------- 1 file changed, 86 insertions(+), 89 deletions(-) (limited to 'plugins/shotwell-publishing/shotwell-publishing.c') diff --git a/plugins/shotwell-publishing/shotwell-publishing.c b/plugins/shotwell-publishing/shotwell-publishing.c index eca05dc..8d7d080 100644 --- a/plugins/shotwell-publishing/shotwell-publishing.c +++ b/plugins/shotwell-publishing/shotwell-publishing.c @@ -1,4 +1,4 @@ -/* shotwell-publishing.c generated by valac 0.34.7, the Vala compiler +/* shotwell-publishing.c generated by valac 0.36.6, the Vala compiler * generated from shotwell-publishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -98,7 +98,7 @@ struct _ShotwellPublishingCoreServicesPrivate { static gpointer shotwell_publishing_core_services_parent_class = NULL; -static SpitModuleIface* shotwell_publishing_core_services_spit_module_parent_iface = NULL; +static SpitModuleIface * shotwell_publishing_core_services_spit_module_parent_iface = NULL; GType shotwell_publishing_core_services_get_type (void) G_GNUC_CONST; #define SHOTWELL_PUBLISHING_CORE_SERVICES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServicesPrivate)) @@ -110,34 +110,34 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy FacebookService* facebook_service_new (GFile* resource_directory); FacebookService* facebook_service_construct (GType object_type, GFile* resource_directory); GType facebook_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); PicasaService* picasa_service_new (GFile* resource_directory); PicasaService* picasa_service_construct (GType object_type, GFile* resource_directory); GType picasa_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add2 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); FlickrService* flickr_service_new (GFile* resource_directory); FlickrService* flickr_service_construct (GType object_type, GFile* resource_directory); GType flickr_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add3 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); YouTubeService* you_tube_service_new (GFile* resource_directory); YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_directory); GType you_tube_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add4 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); PiwigoService* piwigo_service_new (GFile* resource_directory); PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_directory); GType piwigo_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add5 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); static const gchar* shotwell_publishing_core_services_real_get_module_name (SpitModule* base); static const gchar* shotwell_publishing_core_services_real_get_version (SpitModule* base); static const gchar* shotwell_publishing_core_services_real_get_id (SpitModule* base); static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (SpitModule* base, int* result_length1); -static void shotwell_publishing_core_services_finalize (GObject* obj); +static void shotwell_publishing_core_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_add1 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if ((*length) == (*size)) { #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -154,7 +154,7 @@ static void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, Sp } -static void _vala_array_add2 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if ((*length) == (*size)) { #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -171,7 +171,7 @@ static void _vala_array_add2 (SpitPluggable*** array, int* length, int* size, Sp } -static void _vala_array_add3 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if ((*length) == (*size)) { #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -188,7 +188,7 @@ static void _vala_array_add3 (SpitPluggable*** array, int* length, int* size, Sp } -static void _vala_array_add4 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if ((*length) == (*size)) { #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -205,7 +205,7 @@ static void _vala_array_add4 (SpitPluggable*** array, int* length, int* size, Sp } -static void _vala_array_add5 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if ((*length) == (*size)) { #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -225,31 +225,31 @@ static void _vala_array_add5 (SpitPluggable*** array, int* length, int* size, Sp ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GType object_type, GFile* module_file) { ShotwellPublishingCoreServices * self = NULL; GFile* resource_directory = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; PublishingAuthenticatorFactory* factory = NULL; - PublishingAuthenticatorFactory* _tmp2_ = NULL; + PublishingAuthenticatorFactory* _tmp2_; GeeList* authenicators = NULL; - PublishingAuthenticatorFactory* _tmp3_ = NULL; - GeeList* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GeeList* _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; - GeeList* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - GeeList* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - GeeList* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; - GeeList* _tmp26_ = NULL; - gboolean _tmp27_ = FALSE; - SpitPluggable** _tmp31_ = NULL; - gint _tmp31__length1 = 0; - GFile* _tmp32_ = NULL; - PiwigoService* _tmp33_ = NULL; + PublishingAuthenticatorFactory* _tmp3_; + GeeList* _tmp4_; + GFile* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + GeeList* _tmp8_; + gint _tmp9_; + gint _tmp10_; + GeeList* _tmp11_; + gboolean _tmp12_; + GeeList* _tmp16_; + gboolean _tmp17_; + GeeList* _tmp21_; + gboolean _tmp22_; + GeeList* _tmp26_; + gboolean _tmp27_; + SpitPluggable** _tmp31_; + gint _tmp31__length1; + GFile* _tmp32_; + PiwigoService* _tmp33_; #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" g_return_val_if_fail (G_IS_FILE (module_file), NULL); #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -295,10 +295,10 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if (_tmp12_) { #line 298 "shotwell-publishing.c" - SpitPluggable** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - GFile* _tmp14_ = NULL; - FacebookService* _tmp15_ = NULL; + SpitPluggable** _tmp13_; + gint _tmp13__length1; + GFile* _tmp14_; + FacebookService* _tmp15_; #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" _tmp13_ = self->priv->pluggables; #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -318,10 +318,10 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if (_tmp17_) { #line 321 "shotwell-publishing.c" - SpitPluggable** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - GFile* _tmp19_ = NULL; - PicasaService* _tmp20_ = NULL; + SpitPluggable** _tmp18_; + gint _tmp18__length1; + GFile* _tmp19_; + PicasaService* _tmp20_; #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" _tmp18_ = self->priv->pluggables; #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -341,10 +341,10 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if (_tmp22_) { #line 344 "shotwell-publishing.c" - SpitPluggable** _tmp23_ = NULL; - gint _tmp23__length1 = 0; - GFile* _tmp24_ = NULL; - FlickrService* _tmp25_ = NULL; + SpitPluggable** _tmp23_; + gint _tmp23__length1; + GFile* _tmp24_; + FlickrService* _tmp25_; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" _tmp23_ = self->priv->pluggables; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -364,10 +364,10 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if (_tmp27_) { #line 367 "shotwell-publishing.c" - SpitPluggable** _tmp28_ = NULL; - gint _tmp28__length1 = 0; - GFile* _tmp29_ = NULL; - YouTubeService* _tmp30_ = NULL; + SpitPluggable** _tmp28_; + gint _tmp28__length1; + GFile* _tmp29_; + YouTubeService* _tmp30_; #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" _tmp28_ = self->priv->pluggables; #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -412,16 +412,13 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_new (GFile* mo static const gchar* shotwell_publishing_core_services_real_get_module_name (SpitModule* base) { ShotwellPublishingCoreServices * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices); #line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" - _tmp0_ = _ ("Core Publishing Services"); -#line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" - result = _tmp0_; + result = _ ("Core Publishing Services"); #line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" return result; -#line 425 "shotwell-publishing.c" +#line 422 "shotwell-publishing.c" } @@ -434,7 +431,7 @@ static const gchar* shotwell_publishing_core_services_real_get_version (SpitModu result = _VERSION; #line 59 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" return result; -#line 438 "shotwell-publishing.c" +#line 435 "shotwell-publishing.c" } @@ -447,17 +444,17 @@ static const gchar* shotwell_publishing_core_services_real_get_id (SpitModule* b result = "org.yorba.shotwell.publishing.core_services"; #line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" return result; -#line 451 "shotwell-publishing.c" +#line 448 "shotwell-publishing.c" } static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (SpitModule* base, int* result_length1) { ShotwellPublishingCoreServices * 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 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices); #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -472,13 +469,13 @@ static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (Sp if (result_length1) { #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" *result_length1 = _tmp1__length1; -#line 476 "shotwell-publishing.c" +#line 473 "shotwell-publishing.c" } #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" result = _tmp1_; #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" return result; -#line 482 "shotwell-publishing.c" +#line 479 "shotwell-publishing.c" } @@ -489,7 +486,7 @@ static void shotwell_publishing_core_services_class_init (ShotwellPublishingCore g_type_class_add_private (klass, sizeof (ShotwellPublishingCoreServicesPrivate)); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" G_OBJECT_CLASS (klass)->finalize = shotwell_publishing_core_services_finalize; -#line 493 "shotwell-publishing.c" +#line 490 "shotwell-publishing.c" } @@ -497,19 +494,19 @@ static void shotwell_publishing_core_services_spit_module_interface_init (SpitMo #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" shotwell_publishing_core_services_spit_module_parent_iface = g_type_interface_peek_parent (iface); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" - iface->get_module_name = (const gchar* (*)(SpitModule*)) shotwell_publishing_core_services_real_get_module_name; + iface->get_module_name = (const gchar* (*) (SpitModule *)) shotwell_publishing_core_services_real_get_module_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" - iface->get_version = (const gchar* (*)(SpitModule*)) shotwell_publishing_core_services_real_get_version; + iface->get_version = (const gchar* (*) (SpitModule *)) shotwell_publishing_core_services_real_get_version; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" - iface->get_id = (const gchar* (*)(SpitModule*)) shotwell_publishing_core_services_real_get_id; + iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_publishing_core_services_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" - iface->get_pluggables = (SpitPluggable** (*)(SpitModule*, int*)) shotwell_publishing_core_services_real_get_pluggables; -#line 508 "shotwell-publishing.c" + iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_publishing_core_services_real_get_pluggables; +#line 505 "shotwell-publishing.c" } static void shotwell_publishing_core_services_instance_init (ShotwellPublishingCoreServices * self) { - SpitPluggable** _tmp0_ = NULL; + SpitPluggable** _tmp0_; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" self->priv = SHOTWELL_PUBLISHING_CORE_SERVICES_GET_PRIVATE (self); #line 11 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -520,11 +517,11 @@ static void shotwell_publishing_core_services_instance_init (ShotwellPublishingC self->priv->pluggables_length1 = 0; #line 11 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" self->priv->_pluggables_size_ = self->priv->pluggables_length1; -#line 524 "shotwell-publishing.c" +#line 521 "shotwell-publishing.c" } -static void shotwell_publishing_core_services_finalize (GObject* obj) { +static void shotwell_publishing_core_services_finalize (GObject * obj) { ShotwellPublishingCoreServices * self; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices); @@ -532,7 +529,7 @@ static void shotwell_publishing_core_services_finalize (GObject* obj) { self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" G_OBJECT_CLASS (shotwell_publishing_core_services_parent_class)->finalize (obj); -#line 536 "shotwell-publishing.c" +#line 533 "shotwell-publishing.c" } @@ -552,14 +549,14 @@ GType shotwell_publishing_core_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_; ShotwellPublishingCoreServices* _tmp5_ = NULL; - SpitEntryPointParams* _tmp6_ = NULL; - gint _tmp7_ = 0; + SpitEntryPointParams* _tmp6_; + gint _tmp7_; #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" _tmp0_ = params; #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -578,10 +575,10 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) { _tmp7_ = (*_tmp6_).module_spit_interface; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) { -#line 582 "shotwell-publishing.c" - SpitEntryPointParams* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - ShotwellPublishingCoreServices* _tmp10_ = NULL; +#line 579 "shotwell-publishing.c" + SpitEntryPointParams* _tmp8_; + GFile* _tmp9_; + ShotwellPublishingCoreServices* _tmp10_; #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" _tmp8_ = params; #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" @@ -592,19 +589,19 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) { _g_object_unref0 (_tmp5_); #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" _tmp5_ = _tmp10_; -#line 596 "shotwell-publishing.c" +#line 593 "shotwell-publishing.c" } else { #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" _g_object_unref0 (_tmp5_); #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" _tmp5_ = NULL; -#line 602 "shotwell-publishing.c" +#line 599 "shotwell-publishing.c" } #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule); #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala" return result; -#line 608 "shotwell-publishing.c" +#line 605 "shotwell-publishing.c" } -- cgit v1.2.3