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 --- .../shotwell-publishing-extras.c | 280 +++++---------------- 1 file changed, 66 insertions(+), 214 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 04cf9d3..c4556dd 100644 --- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c +++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c @@ -27,37 +27,6 @@ typedef struct _ShotwellPublishingExtraServices ShotwellPublishingExtraServices; typedef struct _ShotwellPublishingExtraServicesClass ShotwellPublishingExtraServicesClass; typedef struct _ShotwellPublishingExtraServicesPrivate ShotwellPublishingExtraServicesPrivate; -#define TYPE_YANDEX_SERVICE (yandex_service_get_type ()) -#define YANDEX_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_YANDEX_SERVICE, YandexService)) -#define YANDEX_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_YANDEX_SERVICE, YandexServiceClass)) -#define IS_YANDEX_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_YANDEX_SERVICE)) -#define IS_YANDEX_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_YANDEX_SERVICE)) -#define YANDEX_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_YANDEX_SERVICE, YandexServiceClass)) - -typedef struct _YandexService YandexService; -typedef struct _YandexServiceClass YandexServiceClass; - -#define TYPE_TUMBLR_SERVICE (tumblr_service_get_type ()) -#define TUMBLR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TUMBLR_SERVICE, TumblrService)) -#define TUMBLR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TUMBLR_SERVICE, TumblrServiceClass)) -#define IS_TUMBLR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TUMBLR_SERVICE)) -#define IS_TUMBLR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TUMBLR_SERVICE)) -#define TUMBLR_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TUMBLR_SERVICE, TumblrServiceClass)) - -typedef struct _TumblrService TumblrService; -typedef struct _TumblrServiceClass TumblrServiceClass; -#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) - -#define TYPE_RAJCE_SERVICE (rajce_service_get_type ()) -#define RAJCE_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RAJCE_SERVICE, RajceService)) -#define RAJCE_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RAJCE_SERVICE, RajceServiceClass)) -#define IS_RAJCE_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RAJCE_SERVICE)) -#define IS_RAJCE_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RAJCE_SERVICE)) -#define RAJCE_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RAJCE_SERVICE, RajceServiceClass)) - -typedef struct _RajceService RajceService; -typedef struct _RajceServiceClass RajceServiceClass; - #define TYPE_GALLERY3_SERVICE (gallery3_service_get_type ()) #define GALLERY3_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GALLERY3_SERVICE, Gallery3Service)) #define GALLERY3_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GALLERY3_SERVICE, Gallery3ServiceClass)) @@ -67,6 +36,7 @@ typedef struct _RajceServiceClass RajceServiceClass; typedef struct _Gallery3Service Gallery3Service; typedef struct _Gallery3ServiceClass Gallery3ServiceClass; +#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) struct _ShotwellPublishingExtraServices { GObject parent_instance; @@ -94,22 +64,10 @@ enum { }; ShotwellPublishingExtraServices* shotwell_publishing_extra_services_new (GFile* module_file); ShotwellPublishingExtraServices* shotwell_publishing_extra_services_construct (GType object_type, GFile* module_file); -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); -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); -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); 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_add14 (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); @@ -121,70 +79,19 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify 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" - *size = (*size) ? (2 * (*size)) : 4; -#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - *array = g_renew (SpitPluggable*, *array, (*size) + 1); -#line 131 "shotwell-publishing-extras.c" - } -#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - (*array)[(*length)++] = value; -#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - (*array)[*length] = NULL; -#line 137 "shotwell-publishing-extras.c" -} - - -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" - *size = (*size) ? (2 * (*size)) : 4; -#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - *array = g_renew (SpitPluggable*, *array, (*size) + 1); -#line 148 "shotwell-publishing-extras.c" - } -#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - (*array)[(*length)++] = value; -#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - (*array)[*length] = NULL; -#line 154 "shotwell-publishing-extras.c" -} - - -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" *size = (*size) ? (2 * (*size)) : 4; #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" *array = g_renew (SpitPluggable*, *array, (*size) + 1); -#line 165 "shotwell-publishing-extras.c" +#line 89 "shotwell-publishing-extras.c" } #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" (*array)[(*length)++] = value; #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" (*array)[*length] = NULL; -#line 171 "shotwell-publishing-extras.c" -} - - -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" - *size = (*size) ? (2 * (*size)) : 4; -#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - *array = g_renew (SpitPluggable*, *array, (*size) + 1); -#line 182 "shotwell-publishing-extras.c" - } -#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - (*array)[(*length)++] = value; -#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - (*array)[*length] = NULL; -#line 188 "shotwell-publishing-extras.c" +#line 95 "shotwell-publishing-extras.c" } @@ -192,134 +99,79 @@ ShotwellPublishingExtraServices* shotwell_publishing_extra_services_construct (G ShotwellPublishingExtraServices * self = NULL; SpitPluggable** _tmp0_; gint _tmp0__length1; - YandexService* _tmp1_; - SpitPluggable** _tmp2_; - gint _tmp2__length1; + GFile* _tmp1_; + GFile* _tmp2_; 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_; + Gallery3Service* _tmp4_; #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" self = (ShotwellPublishingExtraServices*) g_object_new (object_type, NULL); -#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp0_ = self->priv->pluggables; -#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp0__length1 = self->priv->pluggables_length1; -#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp1_ = yandex_service_new (); -#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _vala_array_add14 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); -#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp2_ = self->priv->pluggables; -#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp2__length1 = self->priv->pluggables_length1; -#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp3_ = module_file; -#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp4_ = g_file_get_parent (_tmp3_); -#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp5_ = _tmp4_; -#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp6_ = tumblr_service_new (_tmp5_); -#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _vala_array_add15 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); -#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _g_object_unref0 (_tmp5_); #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp7_ = self->priv->pluggables; + _tmp0_ = self->priv->pluggables; #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp7__length1 = self->priv->pluggables_length1; + _tmp0__length1 = self->priv->pluggables_length1; #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp8_ = module_file; + _tmp1_ = module_file; #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp9_ = g_file_get_parent (_tmp8_); + _tmp2_ = g_file_get_parent (_tmp1_); #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp10_ = _tmp9_; + _tmp3_ = _tmp2_; #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp11_ = rajce_service_new (_tmp10_); + _tmp4_ = gallery3_service_new (_tmp3_); #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _vala_array_add16 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _vala_array_add14 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _g_object_unref0 (_tmp10_); -#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp12_ = self->priv->pluggables; -#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp12__length1 = self->priv->pluggables_length1; -#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp13_ = module_file; -#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp14_ = g_file_get_parent (_tmp13_); -#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp15_ = _tmp14_; -#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _tmp16_ = gallery3_service_new (_tmp15_); -#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _vala_array_add17 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); -#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp3_); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" return self; -#line 277 "shotwell-publishing-extras.c" +#line 129 "shotwell-publishing-extras.c" } ShotwellPublishingExtraServices* shotwell_publishing_extra_services_new (GFile* module_file) { #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" return shotwell_publishing_extra_services_construct (TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, module_file); -#line 284 "shotwell-publishing-extras.c" +#line 136 "shotwell-publishing-extras.c" } static const gchar* shotwell_publishing_extra_services_real_get_module_name (SpitModule* base) { ShotwellPublishingExtraServices * self; const gchar* result = NULL; -#line 30 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 26 "/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" +#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" result = _ ("Shotwell Extra Publishing Services"); -#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" return result; -#line 297 "shotwell-publishing-extras.c" +#line 149 "shotwell-publishing-extras.c" } static const gchar* shotwell_publishing_extra_services_real_get_version (SpitModule* base) { ShotwellPublishingExtraServices * self; const gchar* result = NULL; -#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#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 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" result = _VERSION; -#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" return result; -#line 310 "shotwell-publishing-extras.c" +#line 162 "shotwell-publishing-extras.c" } static const gchar* shotwell_publishing_extra_services_real_get_id (SpitModule* base) { ShotwellPublishingExtraServices * self; const gchar* result = NULL; -#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 34 "/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 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" result = "org.yorba.shotwell.publishing.extras"; -#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" return result; -#line 323 "shotwell-publishing-extras.c" +#line 175 "shotwell-publishing-extras.c" } @@ -330,27 +182,27 @@ static SpitPluggable** shotwell_publishing_extra_services_real_get_pluggables (S gint _tmp0__length1; SpitPluggable** _tmp1_; gint _tmp1__length1; -#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 38 "/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" +#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp0_ = self->priv->pluggables; -#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp0__length1 = self->priv->pluggables_length1; -#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp1_ = _tmp0_; -#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp1__length1 = _tmp0__length1; -#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" if (result_length1) { -#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" *result_length1 = _tmp1__length1; -#line 348 "shotwell-publishing-extras.c" +#line 200 "shotwell-publishing-extras.c" } -#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 39 "/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" +#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" return result; -#line 354 "shotwell-publishing-extras.c" +#line 206 "shotwell-publishing-extras.c" } @@ -361,7 +213,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 365 "shotwell-publishing-extras.c" +#line 217 "shotwell-publishing-extras.c" } @@ -376,7 +228,7 @@ static void shotwell_publishing_extra_services_spit_module_interface_init (SpitM 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 380 "shotwell-publishing-extras.c" +#line 232 "shotwell-publishing-extras.c" } @@ -392,7 +244,7 @@ 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 396 "shotwell-publishing-extras.c" +#line 248 "shotwell-publishing-extras.c" } @@ -404,7 +256,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 408 "shotwell-publishing-extras.c" +#line 260 "shotwell-publishing-extras.c" } @@ -432,51 +284,51 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) { ShotwellPublishingExtraServices* _tmp5_ = NULL; SpitEntryPointParams* _tmp6_; gint _tmp7_; -#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 45 "/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" +#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp1_ = (*_tmp0_).host_min_spit_interface; -#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp2_ = params; -#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp3_ = (*_tmp2_).host_max_spit_interface; -#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp4_ = spit_negotiate_interfaces (_tmp1_, _tmp3_, SPIT_CURRENT_INTERFACE); -#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" (*params).module_spit_interface = _tmp4_; -#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp6_ = params; -#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp7_ = (*_tmp6_).module_spit_interface; -#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) { -#line 454 "shotwell-publishing-extras.c" +#line 306 "shotwell-publishing-extras.c" SpitEntryPointParams* _tmp8_; GFile* _tmp9_; ShotwellPublishingExtraServices* _tmp10_; -#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 49 "/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" +#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp9_ = (*_tmp8_).module_file; -#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp10_ = shotwell_publishing_extra_services_new (_tmp9_); -#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 49 "/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" +#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp5_ = _tmp10_; -#line 468 "shotwell-publishing-extras.c" +#line 320 "shotwell-publishing-extras.c" } else { -#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 49 "/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" +#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" _tmp5_ = NULL; -#line 474 "shotwell-publishing-extras.c" +#line 326 "shotwell-publishing-extras.c" } -#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" +#line 48 "/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" +#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala" return result; -#line 480 "shotwell-publishing-extras.c" +#line 332 "shotwell-publishing-extras.c" } -- cgit v1.2.3