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-data-imports/shotwell-data-imports.c | 91 +++++++++++----------- 1 file changed, 44 insertions(+), 47 deletions(-) (limited to 'plugins/shotwell-data-imports/shotwell-data-imports.c') diff --git a/plugins/shotwell-data-imports/shotwell-data-imports.c b/plugins/shotwell-data-imports/shotwell-data-imports.c index 31600b3..467066b 100644 --- a/plugins/shotwell-data-imports/shotwell-data-imports.c +++ b/plugins/shotwell-data-imports/shotwell-data-imports.c @@ -1,4 +1,4 @@ -/* shotwell-data-imports.c generated by valac 0.34.7, the Vala compiler +/* shotwell-data-imports.c generated by valac 0.36.6, the Vala compiler * generated from shotwell-data-imports.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -55,7 +55,7 @@ struct _ShotwellDataImportsCoreServicesPrivate { static gpointer shotwell_data_imports_core_services_parent_class = NULL; -static SpitModuleIface* shotwell_data_imports_core_services_spit_module_parent_iface = NULL; +static SpitModuleIface * shotwell_data_imports_core_services_spit_module_parent_iface = NULL; GType shotwell_data_imports_core_services_get_type (void) G_GNUC_CONST; #define SHOTWELL_DATA_IMPORTS_CORE_SERVICES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServicesPrivate)) @@ -67,18 +67,18 @@ ShotwellDataImportsCoreServices* shotwell_data_imports_core_services_construct ( FSpotService* fspot_service_new (GFile* resource_directory); FSpotService* fspot_service_construct (GType object_type, GFile* resource_directory); GType fspot_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add7 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add7 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); static const gchar* shotwell_data_imports_core_services_real_get_module_name (SpitModule* base); static const gchar* shotwell_data_imports_core_services_real_get_version (SpitModule* base); static const gchar* shotwell_data_imports_core_services_real_get_id (SpitModule* base); static SpitPluggable** shotwell_data_imports_core_services_real_get_pluggables (SpitModule* base, int* result_length1); -static void shotwell_data_imports_core_services_finalize (GObject* obj); +static void shotwell_data_imports_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_add7 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add7 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" if ((*length) == (*size)) { #line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" @@ -98,11 +98,11 @@ static void _vala_array_add7 (SpitPluggable*** array, int* length, int* size, Sp ShotwellDataImportsCoreServices* shotwell_data_imports_core_services_construct (GType object_type, GFile* module_file) { ShotwellDataImportsCoreServices * self = NULL; GFile* resource_directory = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - SpitPluggable** _tmp2_ = NULL; - gint _tmp2__length1 = 0; - FSpotService* _tmp3_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; + SpitPluggable** _tmp2_; + gint _tmp2__length1; + FSpotService* _tmp3_; #line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" g_return_val_if_fail (G_IS_FILE (module_file), NULL); #line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" @@ -139,16 +139,13 @@ ShotwellDataImportsCoreServices* shotwell_data_imports_core_services_new (GFile* static const gchar* shotwell_data_imports_core_services_real_get_module_name (SpitModule* base) { ShotwellDataImportsCoreServices * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServices); #line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" - _tmp0_ = _ ("Core Data Import Services"); -#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" - result = _tmp0_; + result = _ ("Core Data Import Services"); #line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" return result; -#line 152 "shotwell-data-imports.c" +#line 149 "shotwell-data-imports.c" } @@ -161,7 +158,7 @@ static const gchar* shotwell_data_imports_core_services_real_get_version (SpitMo result = _VERSION; #line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" return result; -#line 165 "shotwell-data-imports.c" +#line 162 "shotwell-data-imports.c" } @@ -174,17 +171,17 @@ static const gchar* shotwell_data_imports_core_services_real_get_id (SpitModule* result = "org.yorba.shotwell.data_imports.core_services"; #line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" return result; -#line 178 "shotwell-data-imports.c" +#line 175 "shotwell-data-imports.c" } static SpitPluggable** shotwell_data_imports_core_services_real_get_pluggables (SpitModule* base, int* result_length1) { ShotwellDataImportsCoreServices * 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 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServices); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" @@ -199,13 +196,13 @@ static SpitPluggable** shotwell_data_imports_core_services_real_get_pluggables ( if (result_length1) { #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" *result_length1 = _tmp1__length1; -#line 203 "shotwell-data-imports.c" +#line 200 "shotwell-data-imports.c" } #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" result = _tmp1_; #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" return result; -#line 209 "shotwell-data-imports.c" +#line 206 "shotwell-data-imports.c" } @@ -216,7 +213,7 @@ static void shotwell_data_imports_core_services_class_init (ShotwellDataImportsC g_type_class_add_private (klass, sizeof (ShotwellDataImportsCoreServicesPrivate)); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" G_OBJECT_CLASS (klass)->finalize = shotwell_data_imports_core_services_finalize; -#line 220 "shotwell-data-imports.c" +#line 217 "shotwell-data-imports.c" } @@ -224,19 +221,19 @@ static void shotwell_data_imports_core_services_spit_module_interface_init (Spit #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" shotwell_data_imports_core_services_spit_module_parent_iface = g_type_interface_peek_parent (iface); #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" - iface->get_module_name = (const gchar* (*)(SpitModule*)) shotwell_data_imports_core_services_real_get_module_name; + iface->get_module_name = (const gchar* (*) (SpitModule *)) shotwell_data_imports_core_services_real_get_module_name; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" - iface->get_version = (const gchar* (*)(SpitModule*)) shotwell_data_imports_core_services_real_get_version; + iface->get_version = (const gchar* (*) (SpitModule *)) shotwell_data_imports_core_services_real_get_version; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" - iface->get_id = (const gchar* (*)(SpitModule*)) shotwell_data_imports_core_services_real_get_id; + iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_data_imports_core_services_real_get_id; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" - iface->get_pluggables = (SpitPluggable** (*)(SpitModule*, int*)) shotwell_data_imports_core_services_real_get_pluggables; -#line 235 "shotwell-data-imports.c" + iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_data_imports_core_services_real_get_pluggables; +#line 232 "shotwell-data-imports.c" } static void shotwell_data_imports_core_services_instance_init (ShotwellDataImportsCoreServices * self) { - SpitPluggable** _tmp0_ = NULL; + SpitPluggable** _tmp0_; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" self->priv = SHOTWELL_DATA_IMPORTS_CORE_SERVICES_GET_PRIVATE (self); #line 11 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" @@ -247,11 +244,11 @@ static void shotwell_data_imports_core_services_instance_init (ShotwellDataImpor self->priv->pluggables_length1 = 0; #line 11 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" self->priv->_pluggables_size_ = self->priv->pluggables_length1; -#line 251 "shotwell-data-imports.c" +#line 248 "shotwell-data-imports.c" } -static void shotwell_data_imports_core_services_finalize (GObject* obj) { +static void shotwell_data_imports_core_services_finalize (GObject * obj) { ShotwellDataImportsCoreServices * self; #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServices); @@ -259,7 +256,7 @@ static void shotwell_data_imports_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-data-imports/shotwell-data-imports.vala" G_OBJECT_CLASS (shotwell_data_imports_core_services_parent_class)->finalize (obj); -#line 263 "shotwell-data-imports.c" +#line 260 "shotwell-data-imports.c" } @@ -279,14 +276,14 @@ GType shotwell_data_imports_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_; ShotwellDataImportsCoreServices* _tmp5_ = NULL; - SpitEntryPointParams* _tmp6_ = NULL; - gint _tmp7_ = 0; + SpitEntryPointParams* _tmp6_; + gint _tmp7_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" _tmp0_ = params; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" @@ -305,10 +302,10 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) { _tmp7_ = (*_tmp6_).module_spit_interface; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) { -#line 309 "shotwell-data-imports.c" - SpitEntryPointParams* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - ShotwellDataImportsCoreServices* _tmp10_ = NULL; +#line 306 "shotwell-data-imports.c" + SpitEntryPointParams* _tmp8_; + GFile* _tmp9_; + ShotwellDataImportsCoreServices* _tmp10_; #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" _tmp8_ = params; #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" @@ -319,19 +316,19 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) { _g_object_unref0 (_tmp5_); #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" _tmp5_ = _tmp10_; -#line 323 "shotwell-data-imports.c" +#line 320 "shotwell-data-imports.c" } else { #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" _g_object_unref0 (_tmp5_); #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" _tmp5_ = NULL; -#line 329 "shotwell-data-imports.c" +#line 326 "shotwell-data-imports.c" } #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule); #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala" return result; -#line 335 "shotwell-data-imports.c" +#line 332 "shotwell-data-imports.c" } -- cgit v1.2.3