summaryrefslogtreecommitdiff
path: root/src/publishing
diff options
context:
space:
mode:
Diffstat (limited to 'src/publishing')
-rw-r--r--src/publishing/APIGlue.c664
-rw-r--r--src/publishing/Publishing.c115
-rw-r--r--src/publishing/PublishingPluginHost.c943
-rw-r--r--src/publishing/PublishingUI.c3405
-rw-r--r--src/publishing/PublishingUI.vala10
5 files changed, 2742 insertions, 2395 deletions
diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c
index 04da15d..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 <glib.h>
#include <glib-object.h>
#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_add60 (gchar** * array, int* length, int* size, gchar* value);
-static gchar** _vala_array_dup22 (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,12 +458,12 @@ 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"
- goto __catch39_g_error;
+#line 462 "APIGlue.c"
+ goto __catch43_g_error;
}
}
- goto __finally39;
- __catch39_g_error:
+ goto __finally43;
+ __catch43_g_error:
{
GError* err = NULL;
GFile* _tmp5_;
@@ -442,9 +485,9 @@ 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"
}
- __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"
@@ -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,88 +696,79 @@ 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"
- goto __catch40_g_error;
+#line 735 "APIGlue.c"
+ goto __catch44_g_error;
}
}
- goto __finally40;
- __catch40_g_error:
+ goto __finally44;
+ __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"
- goto __finally40;
+#line 768 "APIGlue.c"
+ 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"
@@ -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,172 +793,172 @@ 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"
- goto __catch41_g_error;
+#line 924 "APIGlue.c"
+ goto __catch45_g_error;
}
}
- goto __finally41;
- __catch41_g_error:
+ goto __finally45;
+ __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"
- goto __finally41;
+#line 957 "APIGlue.c"
+ 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"
@@ -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_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"
*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_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"
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_add60 (&_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_dup22 (_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);
}
diff --git a/src/publishing/Publishing.c b/src/publishing/Publishing.c
index 5ae726a..4bcc4db 100644
--- a/src/publishing/Publishing.c
+++ b/src/publishing/Publishing.c
@@ -1,4 +1,4 @@
-/* Publishing.c generated by valac 0.36.6, the Vala compiler
+/* Publishing.c generated by valac 0.40.4, the Vala compiler
* generated from Publishing.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 <glib.h>
#include <glib-object.h>
#include <stdlib.h>
@@ -18,86 +19,128 @@
void publishing_init (GError** error);
-static void _vala_array_add51 (gchar** * array, int* length, int* size, gchar* value);
-static void _vala_array_add52 (gchar** * array, int* length, int* size, gchar* value);
-static void _vala_array_add53 (gchar** * array, int* length, int* size, gchar* value);
-static void _vala_array_add54 (gchar** * array, int* length, int* size, gchar* value);
-void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1);
+static void _vala_array_add54 (gchar** * array,
+ int* length,
+ int* size,
+ gchar* value);
+static void _vala_array_add55 (gchar** * array,
+ int* length,
+ int* size,
+ gchar* value);
+static void _vala_array_add56 (gchar** * array,
+ int* length,
+ int* size,
+ gchar* value);
+static void _vala_array_add57 (gchar** * array,
+ int* length,
+ int* size,
+ gchar* value);
+void plugins_register_extension_point (GType type,
+ const gchar* name,
+ const gchar* icon_name,
+ gchar** core_ids,
+ int core_ids_length1);
#define RESOURCES_PUBLISH "applications-internet"
void publishing_terminate (void);
-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_add51 (gchar** * array, int* length, int* size, gchar* value) {
+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_add54 (gchar** * array,
+ int* length,
+ int* size,
+ gchar* value)
+{
#line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
if ((*length) == (*size)) {
#line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 40 "Publishing.c"
+#line 66 "Publishing.c"
}
#line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
(*array)[(*length)++] = value;
#line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
(*array)[*length] = NULL;
-#line 46 "Publishing.c"
+#line 72 "Publishing.c"
}
-static void _vala_array_add52 (gchar** * array, int* length, int* size, gchar* value) {
+static void
+_vala_array_add55 (gchar** * array,
+ int* length,
+ int* size,
+ gchar* value)
+{
#line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
if ((*length) == (*size)) {
#line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 57 "Publishing.c"
+#line 88 "Publishing.c"
}
#line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
(*array)[(*length)++] = value;
#line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
(*array)[*length] = NULL;
-#line 63 "Publishing.c"
+#line 94 "Publishing.c"
}
-static void _vala_array_add53 (gchar** * array, int* length, int* size, gchar* value) {
+static void
+_vala_array_add56 (gchar** * array,
+ int* length,
+ int* size,
+ gchar* value)
+{
#line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
if ((*length) == (*size)) {
#line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 74 "Publishing.c"
+#line 110 "Publishing.c"
}
#line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
(*array)[(*length)++] = value;
#line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
(*array)[*length] = NULL;
-#line 80 "Publishing.c"
+#line 116 "Publishing.c"
}
-static void _vala_array_add54 (gchar** * array, int* length, int* size, gchar* value) {
+static void
+_vala_array_add57 (gchar** * array,
+ int* length,
+ int* size,
+ gchar* value)
+{
#line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
if ((*length) == (*size)) {
#line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 91 "Publishing.c"
+#line 132 "Publishing.c"
}
#line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
(*array)[(*length)++] = value;
#line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
(*array)[*length] = NULL;
-#line 97 "Publishing.c"
+#line 138 "Publishing.c"
}
-void publishing_init (GError** error) {
+void
+publishing_init (GError** error)
+{
gchar** core_ids = NULL;
gchar** _tmp0_;
gint core_ids_length1;
@@ -131,7 +174,7 @@ void publishing_init (GError** error) {
#line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
_tmp2_ = g_strdup ("org.yorba.shotwell.publishing.facebook");
#line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
- _vala_array_add51 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_);
+ _vala_array_add54 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_);
#line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
_tmp3_ = core_ids;
#line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -139,7 +182,7 @@ void publishing_init (GError** error) {
#line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
_tmp4_ = g_strdup ("org.yorba.shotwell.publishing.picasa");
#line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
- _vala_array_add52 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp4_);
+ _vala_array_add55 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp4_);
#line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
_tmp5_ = core_ids;
#line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -147,7 +190,7 @@ void publishing_init (GError** error) {
#line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
_tmp6_ = g_strdup ("org.yorba.shotwell.publishing.flickr");
#line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
- _vala_array_add53 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp6_);
+ _vala_array_add56 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp6_);
#line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
_tmp7_ = core_ids;
#line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -155,7 +198,7 @@ void publishing_init (GError** error) {
#line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
_tmp8_ = g_strdup ("org.yorba.shotwell.publishing.youtube");
#line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
- _vala_array_add54 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp8_);
+ _vala_array_add57 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp8_);
#line 16 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
_tmp9_ = core_ids;
#line 16 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -164,15 +207,21 @@ void publishing_init (GError** error) {
plugins_register_extension_point (SPIT_PUBLISHING_TYPE_SERVICE, _ ("Publishing"), RESOURCES_PUBLISH, _tmp9_, _tmp9__length1);
#line 9 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
core_ids = (_vala_array_free (core_ids, core_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 168 "Publishing.c"
+#line 211 "Publishing.c"
}
-void publishing_terminate (void) {
+void
+publishing_terminate (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) {
@@ -184,7 +233,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);
}
diff --git a/src/publishing/PublishingPluginHost.c b/src/publishing/PublishingPluginHost.c
index 54f1495..8ee8e8d 100644
--- a/src/publishing/PublishingPluginHost.c
+++ b/src/publishing/PublishingPluginHost.c
@@ -1,4 +1,4 @@
-/* PublishingPluginHost.c generated by valac 0.36.6, the Vala compiler
+/* PublishingPluginHost.c generated by valac 0.40.4, the Vala compiler
* generated from PublishingPluginHost.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 <glib.h>
#include <glib-object.h>
#include "shotwell-plugin-dev-1.0.h"
@@ -50,6 +51,11 @@ typedef struct _SpitPublishingConcretePublishingHostPrivate SpitPublishingConcre
typedef struct _PublishingUIPublishingDialog PublishingUIPublishingDialog;
typedef struct _PublishingUIPublishingDialogClass PublishingUIPublishingDialogClass;
+enum {
+ SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_0_PROPERTY,
+ SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_NUM_PROPERTIES
+};
+static GParamSpec* spit_publishing_concrete_publishing_host_properties[SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER (publishing_glue_media_source_publishable_wrapper_get_type ())
@@ -172,47 +178,74 @@ GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST;
GType spit_publishing_concrete_publishing_host_get_type (void) G_GNUC_CONST;
GType publishing_ui_publishing_dialog_get_type (void) G_GNUC_CONST;
#define SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHostPrivate))
-enum {
- SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_DUMMY_PROPERTY
-};
#define SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_PREPARE_STATUS_DESCRIPTION _ ("Preparing for upload")
#define SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_UPLOAD_STATUS_DESCRIPTION _ ("Uploading %d of %d")
#define SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_STATUS_PREPARATION_FRACTION 0.3
#define SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_STATUS_UPLOAD_FRACTION 0.7
-SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_new (SpitPublishingService* service, PublishingUIPublishingDialog* dialog, SpitPublishingPublishable** publishables, int publishables_length1);
-SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_construct (GType object_type, SpitPublishingService* service, PublishingUIPublishingDialog* dialog, SpitPublishingPublishable** publishables, int publishables_length1);
-PluginsStandardHostInterface* plugins_standard_host_interface_new (SpitPluggable* pluggable, const gchar* config_domain);
-PluginsStandardHostInterface* plugins_standard_host_interface_construct (GType object_type, SpitPluggable* pluggable, const gchar* config_domain);
-static SpitPublishingPublishable** _vala_array_dup20 (SpitPublishingPublishable** self, int length);
+SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_new (SpitPublishingService* service,
+ PublishingUIPublishingDialog* dialog,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1);
+SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_construct (GType object_type,
+ SpitPublishingService* service,
+ PublishingUIPublishingDialog* dialog,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1);
+PluginsStandardHostInterface* plugins_standard_host_interface_new (SpitPluggable* pluggable,
+ const gchar* config_domain);
+PluginsStandardHostInterface* plugins_standard_host_interface_construct (GType object_type,
+ SpitPluggable* pluggable,
+ const gchar* config_domain);
+static SpitPublishingPublishable** _vala_array_dup18 (SpitPublishingPublishable** self,
+ int length);
static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPublishingConcretePublishingHost* self);
static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingConcretePublishingHost* self);
GType publishing_glue_media_source_publishable_wrapper_get_type (void) G_GNUC_CONST;
void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMediaSourcePublishableWrapper* self);
-static void spit_publishing_concrete_publishing_host_report_plugin_upload_progress (SpitPublishingConcretePublishingHost* self, gint file_number, gdouble fraction_complete);
+static void spit_publishing_concrete_publishing_host_report_plugin_upload_progress (SpitPublishingConcretePublishingHost* self,
+ gint file_number,
+ gdouble fraction_complete);
SpitPublishingDialogPane* publishing_ui_publishing_dialog_get_active_pane (PublishingUIPublishingDialog* self);
GType publishing_ui_concrete_dialog_pane_get_type (void) G_GNUC_CONST;
GType publishing_ui_progress_pane_get_type (void) G_GNUC_CONST;
-void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, const gchar* status_text, gdouble progress);
+void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self,
+ const gchar* status_text,
+ gdouble progress);
static void spit_publishing_concrete_publishing_host_install_progress_pane (SpitPublishingConcretePublishingHost* self);
PublishingUIProgressPane* publishing_ui_progress_pane_new (void);
PublishingUIProgressPane* publishing_ui_progress_pane_construct (GType object_type);
-void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* self, SpitPublishingDialogPane* pane);
-void spit_publishing_concrete_publishing_host_set_button_mode (SpitPublishingConcretePublishingHost* self, SpitPublishingPluginHostButtonMode mode);
-static void spit_publishing_concrete_publishing_host_real_install_dialog_pane (SpitPublishingPluginHost* base, SpitPublishingDialogPane* pane, SpitPublishingPluginHostButtonMode button_mode);
-static void spit_publishing_concrete_publishing_host_real_post_error (SpitPublishingPluginHost* base, GError* err);
-PublishingUIStaticMessagePane* publishing_ui_static_message_pane_new (const gchar* message_string, gboolean enable_markup);
-PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GType object_type, const gchar* message_string, gboolean enable_markup);
+void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* self,
+ SpitPublishingDialogPane* pane);
+void spit_publishing_concrete_publishing_host_set_button_mode (SpitPublishingConcretePublishingHost* self,
+ SpitPublishingPluginHostButtonMode mode);
+static void spit_publishing_concrete_publishing_host_real_install_dialog_pane (SpitPublishingPluginHost* base,
+ SpitPublishingDialogPane* pane,
+ SpitPublishingPluginHostButtonMode button_mode);
+static void spit_publishing_concrete_publishing_host_real_post_error (SpitPublishingPluginHost* base,
+ GError* err);
+PublishingUIStaticMessagePane* publishing_ui_static_message_pane_new (const gchar* message_string,
+ gboolean enable_markup);
+PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GType object_type,
+ const gchar* message_string,
+ gboolean enable_markup);
GType publishing_ui_static_message_pane_get_type (void) G_GNUC_CONST;
void publishing_ui_publishing_dialog_set_close_button_mode (PublishingUIPublishingDialog* self);
void publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialog* self);
static void spit_publishing_concrete_publishing_host_real_stop_publishing (SpitPublishingPluginHost* base);
void spit_publishing_concrete_publishing_host_start_publishing (SpitPublishingConcretePublishingHost* self);
static SpitPublishingPublisher* spit_publishing_concrete_publishing_host_real_get_publisher (SpitPublishingPluginHost* base);
-static void spit_publishing_concrete_publishing_host_real_install_static_message_pane (SpitPublishingPluginHost* base, const gchar* message, SpitPublishingPluginHostButtonMode button_mode);
-static void spit_publishing_concrete_publishing_host_real_install_pango_message_pane (SpitPublishingPluginHost* base, const gchar* markup, SpitPublishingPluginHostButtonMode button_mode);
+static void spit_publishing_concrete_publishing_host_real_install_static_message_pane (SpitPublishingPluginHost* base,
+ const gchar* message,
+ SpitPublishingPluginHostButtonMode button_mode);
+static void spit_publishing_concrete_publishing_host_real_install_pango_message_pane (SpitPublishingPluginHost* base,
+ const gchar* markup,
+ SpitPublishingPluginHostButtonMode button_mode);
static void spit_publishing_concrete_publishing_host_real_install_success_pane (SpitPublishingPluginHost* base);
-PublishingUISuccessPane* publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media, gint num_uploaded);
-PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type, SpitPublishingPublisherMediaType published_media, gint num_uploaded);
+PublishingUISuccessPane* publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media,
+ gint num_uploaded);
+PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type,
+ SpitPublishingPublisherMediaType published_media,
+ gint num_uploaded);
GType publishing_ui_success_pane_get_type (void) G_GNUC_CONST;
static void spit_publishing_concrete_publishing_host_real_install_account_fetch_wait_pane (SpitPublishingPluginHost* base);
PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_new (void);
@@ -222,159 +255,175 @@ static void spit_publishing_concrete_publishing_host_real_install_login_wait_pan
PublishingUILoginWaitPane* publishing_ui_login_wait_pane_new (void);
PublishingUILoginWaitPane* publishing_ui_login_wait_pane_construct (GType object_type);
GType publishing_ui_login_wait_pane_get_type (void) G_GNUC_CONST;
-static void spit_publishing_concrete_publishing_host_real_install_welcome_pane (SpitPublishingPluginHost* base, const gchar* welcome_message, SpitPublishingLoginCallback login_clicked_callback, void* login_clicked_callback_target);
+static void spit_publishing_concrete_publishing_host_real_install_welcome_pane (SpitPublishingPluginHost* base,
+ const gchar* welcome_message,
+ SpitPublishingLoginCallback login_clicked_callback,
+ void* login_clicked_callback_target);
GType publishing_ui_login_welcome_pane_get_type (void) G_GNUC_CONST;
PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_new (const gchar* service_welcome_message);
-PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType object_type, const gchar* service_welcome_message);
-static void _spit_publishing_concrete_publishing_host_on_login_clicked_publishing_ui_login_welcome_pane_login_requested (PublishingUILoginWelcomePane* _sender, gpointer self);
-static void spit_publishing_concrete_publishing_host_real_set_service_locked (SpitPublishingPluginHost* base, gboolean locked);
+PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType object_type,
+ const gchar* service_welcome_message);
+static void _spit_publishing_concrete_publishing_host_on_login_clicked_publishing_ui_login_welcome_pane_login_requested (PublishingUILoginWelcomePane* _sender,
+ gpointer self);
+static void spit_publishing_concrete_publishing_host_real_set_service_locked (SpitPublishingPluginHost* base,
+ gboolean locked);
void publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* self);
void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublishingDialog* self);
-static void spit_publishing_concrete_publishing_host_real_set_dialog_default_widget (SpitPublishingPluginHost* base, GtkWidget* widget);
+static void spit_publishing_concrete_publishing_host_real_set_dialog_default_widget (SpitPublishingPluginHost* base,
+ GtkWidget* widget);
static SpitPublishingPublisherMediaType spit_publishing_concrete_publishing_host_real_get_publishable_media_type (SpitPublishingPluginHost* base);
-static SpitPublishingPublishable** spit_publishing_concrete_publishing_host_real_get_publishables (SpitPublishingPluginHost* base, int* result_length1);
-static SpitPublishingPublishable** _vala_array_dup21 (SpitPublishingPublishable** self, int length);
-static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_real_serialize_publishables (SpitPublishingPluginHost* base, gint content_major_axis, gboolean strip_metadata, void** result_target, GDestroyNotify* result_target_destroy_notify);
+static SpitPublishingPublishable** spit_publishing_concrete_publishing_host_real_get_publishables (SpitPublishingPluginHost* base,
+ int* result_length1);
+static SpitPublishingPublishable** _vala_array_dup19 (SpitPublishingPublishable** self,
+ int length);
+static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_real_serialize_publishables (SpitPublishingPluginHost* base,
+ gint content_major_axis,
+ gboolean strip_metadata,
+ void** result_target,
+ GDestroyNotify* result_target_destroy_notify);
void spin_event_loop (void);
-GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (PublishingGlueMediaSourcePublishableWrapper* self, gint content_major_axis, gboolean strip_metadata, GError** error);
-static void _spit_publishing_concrete_publishing_host_report_plugin_upload_progress_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
+GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (PublishingGlueMediaSourcePublishableWrapper* self,
+ gint content_major_axis,
+ gboolean strip_metadata,
+ GError** error);
+static void _spit_publishing_concrete_publishing_host_report_plugin_upload_progress_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self);
static void spit_publishing_concrete_publishing_host_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 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return self ? g_object_ref (self) : NULL;
-#line 250 "PublishingPluginHost.c"
+#line 307 "PublishingPluginHost.c"
}
-static SpitPublishingPublishable** _vala_array_dup20 (SpitPublishingPublishable** self, int length) {
+static SpitPublishingPublishable**
+_vala_array_dup18 (SpitPublishingPublishable** self,
+ int length)
+{
SpitPublishingPublishable** result;
int i;
#line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
result = g_new0 (SpitPublishingPublishable*, length + 1);
#line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
for (i = 0; i < length; i++) {
-#line 261 "PublishingPluginHost.c"
+#line 321 "PublishingPluginHost.c"
SpitPublishingPublishable* _tmp0_;
#line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
result[i] = _tmp0_;
-#line 267 "PublishingPluginHost.c"
+#line 327 "PublishingPluginHost.c"
}
#line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return result;
-#line 271 "PublishingPluginHost.c"
+#line 331 "PublishingPluginHost.c"
}
-SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_construct (GType object_type, SpitPublishingService* service, PublishingUIPublishingDialog* dialog, SpitPublishingPublishable** publishables, int publishables_length1) {
+SpitPublishingConcretePublishingHost*
+spit_publishing_concrete_publishing_host_construct (GType object_type,
+ SpitPublishingService* service,
+ PublishingUIPublishingDialog* dialog,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1)
+{
SpitPublishingConcretePublishingHost * self = NULL;
- SpitPublishingService* _tmp0_;
- PublishingUIPublishingDialog* _tmp1_;
- SpitPublishingPublishable** _tmp2_;
- gint _tmp2__length1;
- SpitPublishingPublishable** _tmp3_;
- gint _tmp3__length1;
- SpitPublishingPublishable** _tmp4_;
- gint _tmp4__length1;
- SpitPublishingService* _tmp9_;
- SpitPublishingPublisher* _tmp10_;
+ SpitPublishingPublishable** _tmp0_;
+ gint _tmp0__length1;
+ SpitPublishingPublisher* _tmp4_;
#line 24 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
#line 24 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (dialog), NULL);
#line 26 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp0_ = service;
-#line 26 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- self = (SpitPublishingConcretePublishingHost*) plugins_standard_host_interface_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_PLUGGABLE, SpitPluggable), "sharing");
-#line 27 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp1_ = dialog;
+ self = (SpitPublishingConcretePublishingHost*) plugins_standard_host_interface_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (service, SPIT_TYPE_PLUGGABLE, SpitPluggable), "sharing");
#line 27 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- self->priv->dialog = _tmp1_;
-#line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp2_ = publishables;
+ self->priv->dialog = dialog;
#line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp2__length1 = publishables_length1;
+ _tmp0_ = (publishables != NULL) ? _vala_array_dup18 (publishables, publishables_length1) : ((gpointer) publishables);
#line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp3_ = (_tmp2_ != NULL) ? _vala_array_dup20 (_tmp2_, _tmp2__length1) : ((gpointer) _tmp2_);
-#line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp3__length1 = _tmp2__length1;
+ _tmp0__length1 = publishables_length1;
#line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
#line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- self->priv->publishables = _tmp3_;
+ self->priv->publishables = _tmp0_;
#line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- self->priv->publishables_length1 = _tmp3__length1;
+ self->priv->publishables_length1 = _tmp0__length1;
#line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self->priv->_publishables_size_ = self->priv->publishables_length1;
-#line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp4_ = publishables;
-#line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp4__length1 = publishables_length1;
-#line 319 "PublishingPluginHost.c"
+#line 366 "PublishingPluginHost.c"
{
SpitPublishingPublishable** curr_publishable_collection = NULL;
gint curr_publishable_collection_length1 = 0;
gint _curr_publishable_collection_size_ = 0;
gint curr_publishable_it = 0;
#line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- curr_publishable_collection = _tmp4_;
+ curr_publishable_collection = publishables;
#line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- curr_publishable_collection_length1 = _tmp4__length1;
+ curr_publishable_collection_length1 = publishables_length1;
#line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- for (curr_publishable_it = 0; curr_publishable_it < _tmp4__length1; curr_publishable_it = curr_publishable_it + 1) {
-#line 331 "PublishingPluginHost.c"
- SpitPublishingPublishable* _tmp5_;
+ for (curr_publishable_it = 0; curr_publishable_it < publishables_length1; curr_publishable_it = curr_publishable_it + 1) {
+#line 378 "PublishingPluginHost.c"
+ SpitPublishingPublishable* _tmp1_;
SpitPublishingPublishable* curr_publishable = NULL;
#line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp5_ = _g_object_ref0 (curr_publishable_collection[curr_publishable_it]);
+ _tmp1_ = _g_object_ref0 (curr_publishable_collection[curr_publishable_it]);
#line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- curr_publishable = _tmp5_;
-#line 338 "PublishingPluginHost.c"
+ curr_publishable = _tmp1_;
+#line 385 "PublishingPluginHost.c"
{
- SpitPublishingPublisherMediaType _tmp6_;
- SpitPublishingPublishable* _tmp7_;
- SpitPublishingPublisherMediaType _tmp8_;
-#line 31 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp6_ = self->priv->media_type;
+ SpitPublishingPublisherMediaType _tmp2_;
+ SpitPublishingPublishable* _tmp3_;
#line 31 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp7_ = curr_publishable;
+ _tmp2_ = self->priv->media_type;
#line 31 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp8_ = spit_publishing_publishable_get_media_type (_tmp7_);
+ _tmp3_ = curr_publishable;
#line 31 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- self->priv->media_type = _tmp6_ | _tmp8_;
+ self->priv->media_type = _tmp2_ | spit_publishing_publishable_get_media_type (_tmp3_);
#line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (curr_publishable);
-#line 353 "PublishingPluginHost.c"
+#line 397 "PublishingPluginHost.c"
}
}
}
#line 33 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp9_ = service;
-#line 33 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp10_ = spit_publishing_service_create_publisher (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost));
+ _tmp4_ = spit_publishing_service_create_publisher (service, G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost));
#line 33 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (self->priv->active_publisher);
#line 33 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- self->priv->active_publisher = _tmp10_;
+ self->priv->active_publisher = _tmp4_;
#line 24 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return self;
-#line 367 "PublishingPluginHost.c"
+#line 409 "PublishingPluginHost.c"
}
-SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_new (SpitPublishingService* service, PublishingUIPublishingDialog* dialog, SpitPublishingPublishable** publishables, int publishables_length1) {
+SpitPublishingConcretePublishingHost*
+spit_publishing_concrete_publishing_host_new (SpitPublishingService* service,
+ PublishingUIPublishingDialog* dialog,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1)
+{
#line 24 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return spit_publishing_concrete_publishing_host_construct (SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, service, dialog, publishables, publishables_length1);
-#line 374 "PublishingPluginHost.c"
+#line 421 "PublishingPluginHost.c"
}
-static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPublishingConcretePublishingHost* self) {
+static void
+spit_publishing_concrete_publishing_host_on_login_clicked (SpitPublishingConcretePublishingHost* self)
+{
SpitPublishingLoginCallback _tmp0_;
void* _tmp0__target;
#line 36 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -385,7 +434,7 @@ static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPubli
_tmp0__target = self->priv->current_login_callback_target;
#line 37 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
if (_tmp0_ != NULL) {
-#line 389 "PublishingPluginHost.c"
+#line 438 "PublishingPluginHost.c"
SpitPublishingLoginCallback _tmp1_;
void* _tmp1__target;
#line 38 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -394,12 +443,14 @@ static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPubli
_tmp1__target = self->priv->current_login_callback_target;
#line 38 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp1_ (_tmp1__target);
-#line 398 "PublishingPluginHost.c"
+#line 447 "PublishingPluginHost.c"
}
}
-static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingConcretePublishingHost* self) {
+static void
+spit_publishing_concrete_publishing_host_clean_up (SpitPublishingConcretePublishingHost* self)
+{
SpitPublishingPublishable** _tmp0_;
gint _tmp0__length1;
#line 41 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -408,7 +459,7 @@ static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingCon
_tmp0_ = self->priv->publishables;
#line 42 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp0__length1 = self->priv->publishables_length1;
-#line 412 "PublishingPluginHost.c"
+#line 463 "PublishingPluginHost.c"
{
SpitPublishingPublishable** publishable_collection = NULL;
gint publishable_collection_length1 = 0;
@@ -420,14 +471,14 @@ static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingCon
publishable_collection_length1 = _tmp0__length1;
#line 42 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
for (publishable_it = 0; publishable_it < _tmp0__length1; publishable_it = publishable_it + 1) {
-#line 424 "PublishingPluginHost.c"
+#line 475 "PublishingPluginHost.c"
SpitPublishingPublishable* _tmp1_;
SpitPublishingPublishable* publishable = NULL;
#line 42 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp1_ = _g_object_ref0 (publishable_collection[publishable_it]);
#line 42 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
publishable = _tmp1_;
-#line 431 "PublishingPluginHost.c"
+#line 482 "PublishingPluginHost.c"
{
SpitPublishingPublishable* _tmp2_;
#line 43 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -436,14 +487,18 @@ static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingCon
publishing_glue_media_source_publishable_wrapper_clean_up (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper));
#line 42 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (publishable);
-#line 440 "PublishingPluginHost.c"
+#line 491 "PublishingPluginHost.c"
}
}
}
}
-static void spit_publishing_concrete_publishing_host_report_plugin_upload_progress (SpitPublishingConcretePublishingHost* self, gint file_number, gdouble fraction_complete) {
+static void
+spit_publishing_concrete_publishing_host_report_plugin_upload_progress (SpitPublishingConcretePublishingHost* self,
+ gint file_number,
+ gdouble fraction_complete)
+{
PublishingUIPublishingDialog* _tmp0_;
SpitPublishingDialogPane* _tmp1_;
SpitPublishingDialogPane* _tmp2_;
@@ -452,15 +507,13 @@ static void spit_publishing_concrete_publishing_host_report_plugin_upload_progre
PublishingUIPublishingDialog* _tmp4_;
SpitPublishingDialogPane* _tmp5_;
gchar* status_string = NULL;
- gint _tmp6_;
- SpitPublishingPublishable** _tmp7_;
- gint _tmp7__length1;
- gchar* _tmp8_;
+ SpitPublishingPublishable** _tmp6_;
+ gint _tmp6__length1;
+ gchar* _tmp7_;
gdouble status_fraction = 0.0;
- gdouble _tmp9_;
- PublishingUIProgressPane* _tmp10_;
- const gchar* _tmp11_;
- gdouble _tmp12_;
+ PublishingUIProgressPane* _tmp8_;
+ const gchar* _tmp9_;
+ gdouble _tmp10_;
#line 46 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self));
#line 48 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -477,7 +530,7 @@ static void spit_publishing_concrete_publishing_host_report_plugin_upload_progre
if (_tmp3_) {
#line 49 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return;
-#line 481 "PublishingPluginHost.c"
+#line 534 "PublishingPluginHost.c"
}
#line 51 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp4_ = self->priv->dialog;
@@ -486,36 +539,34 @@ static void spit_publishing_concrete_publishing_host_report_plugin_upload_progre
#line 51 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
pane = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_UI_TYPE_PROGRESS_PANE, PublishingUIProgressPane);
#line 53 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp6_ = file_number;
-#line 53 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp7_ = self->priv->publishables;
+ _tmp6_ = self->priv->publishables;
#line 53 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp7__length1 = self->priv->publishables_length1;
+ _tmp6__length1 = self->priv->publishables_length1;
#line 53 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp8_ = g_strdup_printf (SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_UPLOAD_STATUS_DESCRIPTION, _tmp6_, _tmp7__length1);
+ _tmp7_ = g_strdup_printf (SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_UPLOAD_STATUS_DESCRIPTION, file_number, _tmp6__length1);
#line 53 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- status_string = _tmp8_;
+ status_string = _tmp7_;
#line 55 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp9_ = fraction_complete;
-#line 55 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- status_fraction = SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_STATUS_PREPARATION_FRACTION + (SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_STATUS_UPLOAD_FRACTION * _tmp9_);
+ status_fraction = SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_STATUS_PREPARATION_FRACTION + (SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_STATUS_UPLOAD_FRACTION * fraction_complete);
#line 58 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp10_ = pane;
+ _tmp8_ = pane;
#line 58 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp11_ = status_string;
+ _tmp9_ = status_string;
#line 58 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp12_ = status_fraction;
+ _tmp10_ = status_fraction;
#line 58 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- publishing_ui_progress_pane_set_status (_tmp10_, _tmp11_, _tmp12_);
+ publishing_ui_progress_pane_set_status (_tmp8_, _tmp9_, _tmp10_);
#line 46 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_free0 (status_string);
#line 46 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (pane);
-#line 515 "PublishingPluginHost.c"
+#line 564 "PublishingPluginHost.c"
}
-static void spit_publishing_concrete_publishing_host_install_progress_pane (SpitPublishingConcretePublishingHost* self) {
+static void
+spit_publishing_concrete_publishing_host_install_progress_pane (SpitPublishingConcretePublishingHost* self)
+{
PublishingUIProgressPane* progress_pane = NULL;
PublishingUIProgressPane* _tmp0_;
PublishingUIPublishingDialog* _tmp1_;
@@ -533,17 +584,19 @@ static void spit_publishing_concrete_publishing_host_install_progress_pane (Spit
spit_publishing_concrete_publishing_host_set_button_mode (self, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 61 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (progress_pane);
-#line 537 "PublishingPluginHost.c"
+#line 588 "PublishingPluginHost.c"
}
-static void spit_publishing_concrete_publishing_host_real_install_dialog_pane (SpitPublishingPluginHost* base, SpitPublishingDialogPane* pane, SpitPublishingPluginHostButtonMode button_mode) {
+static void
+spit_publishing_concrete_publishing_host_real_install_dialog_pane (SpitPublishingPluginHost* base,
+ SpitPublishingDialogPane* pane,
+ SpitPublishingPluginHostButtonMode button_mode)
+{
SpitPublishingConcretePublishingHost * self;
gboolean _tmp0_ = FALSE;
SpitPublishingPublisher* _tmp1_;
- PublishingUIPublishingDialog* _tmp4_;
- SpitPublishingDialogPane* _tmp5_;
- SpitPublishingPluginHostButtonMode _tmp6_;
+ PublishingUIPublishingDialog* _tmp3_;
#line 68 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
#line 68 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -557,39 +610,35 @@ static void spit_publishing_concrete_publishing_host_real_install_dialog_pane (S
if (_tmp1_ == NULL) {
#line 72 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp0_ = TRUE;
-#line 560 "PublishingPluginHost.c"
+#line 613 "PublishingPluginHost.c"
} else {
SpitPublishingPublisher* _tmp2_;
- gboolean _tmp3_;
#line 72 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp2_ = self->priv->active_publisher;
#line 72 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp3_ = spit_publishing_publisher_is_running (_tmp2_);
-#line 72 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp0_ = !_tmp3_;
-#line 570 "PublishingPluginHost.c"
+ _tmp0_ = !spit_publishing_publisher_is_running (_tmp2_);
+#line 620 "PublishingPluginHost.c"
}
#line 72 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
if (_tmp0_) {
#line 73 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return;
-#line 576 "PublishingPluginHost.c"
+#line 626 "PublishingPluginHost.c"
}
#line 75 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp4_ = self->priv->dialog;
-#line 75 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp5_ = pane;
+ _tmp3_ = self->priv->dialog;
#line 75 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- publishing_ui_publishing_dialog_install_pane (_tmp4_, _tmp5_);
-#line 77 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp6_ = button_mode;
+ publishing_ui_publishing_dialog_install_pane (_tmp3_, pane);
#line 77 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- spit_publishing_concrete_publishing_host_set_button_mode (self, _tmp6_);
-#line 588 "PublishingPluginHost.c"
+ spit_publishing_concrete_publishing_host_set_button_mode (self, button_mode);
+#line 634 "PublishingPluginHost.c"
}
-static void spit_publishing_concrete_publishing_host_real_post_error (SpitPublishingPluginHost* base, GError* err) {
+static void
+spit_publishing_concrete_publishing_host_real_post_error (SpitPublishingPluginHost* base,
+ GError* err)
+{
SpitPublishingConcretePublishingHost * self;
gchar* msg = NULL;
SpitPublishingPublisher* _tmp0_;
@@ -599,20 +648,19 @@ static void spit_publishing_concrete_publishing_host_real_post_error (SpitPublis
gchar* _tmp4_;
gchar* _tmp5_;
const gchar* _tmp6_;
- GError* _tmp7_;
- const gchar* _tmp8_;
+ const gchar* _tmp7_;
+ gchar* _tmp8_;
gchar* _tmp9_;
gchar* _tmp10_;
- gchar* _tmp11_;
- const gchar* _tmp12_;
- gchar* _tmp13_;
- PublishingUIPublishingDialog* _tmp14_;
- const gchar* _tmp15_;
+ const gchar* _tmp11_;
+ gchar* _tmp12_;
+ PublishingUIPublishingDialog* _tmp13_;
+ const gchar* _tmp14_;
+ PublishingUIStaticMessagePane* _tmp15_;
PublishingUIStaticMessagePane* _tmp16_;
- PublishingUIStaticMessagePane* _tmp17_;
+ PublishingUIPublishingDialog* _tmp17_;
PublishingUIPublishingDialog* _tmp18_;
- PublishingUIPublishingDialog* _tmp19_;
- SpitPublishingPublisher* _tmp20_;
+ SpitPublishingPublisher* _tmp19_;
#line 80 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
#line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -634,65 +682,64 @@ static void spit_publishing_concrete_publishing_host_real_post_error (SpitPublis
#line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp6_ = msg;
#line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp7_ = err;
-#line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp8_ = _tmp7_->message;
+ _tmp7_ = err->message;
#line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp9_ = g_markup_printf_escaped ("\n\n<i>%s</i>\n\n", _tmp8_);
+ _tmp8_ = g_markup_printf_escaped ("\n\n<i>%s</i>\n\n", _tmp7_);
#line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp10_ = _tmp9_;
+ _tmp9_ = _tmp8_;
#line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp11_ = g_strconcat (_tmp6_, _tmp10_, NULL);
+ _tmp10_ = g_strconcat (_tmp6_, _tmp9_, NULL);
#line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_free0 (msg);
#line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- msg = _tmp11_;
+ msg = _tmp10_;
#line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _g_free0 (_tmp10_);
+ _g_free0 (_tmp9_);
#line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp12_ = msg;
+ _tmp11_ = msg;
#line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp13_ = g_strconcat (_tmp12_, _ ("To try publishing to another service, select one from the above menu."), NULL);
+ _tmp12_ = g_strconcat (_tmp11_, _ ("To try publishing to another service, select one from the above menu."), NULL);
#line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_free0 (msg);
#line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- msg = _tmp13_;
+ msg = _tmp12_;
#line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp14_ = self->priv->dialog;
+ _tmp13_ = self->priv->dialog;
#line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp15_ = msg;
+ _tmp14_ = msg;
#line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp16_ = publishing_ui_static_message_pane_new (_tmp15_, TRUE);
+ _tmp15_ = publishing_ui_static_message_pane_new (_tmp14_, TRUE);
#line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp17_ = _tmp16_;
+ _tmp16_ = _tmp15_;
#line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- publishing_ui_publishing_dialog_install_pane (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
+ publishing_ui_publishing_dialog_install_pane (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
#line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _g_object_unref0 (_tmp17_);
+ _g_object_unref0 (_tmp16_);
#line 87 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp18_ = self->priv->dialog;
+ _tmp17_ = self->priv->dialog;
#line 87 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- publishing_ui_publishing_dialog_set_close_button_mode (_tmp18_);
+ publishing_ui_publishing_dialog_set_close_button_mode (_tmp17_);
#line 88 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp19_ = self->priv->dialog;
+ _tmp18_ = self->priv->dialog;
#line 88 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- publishing_ui_publishing_dialog_unlock_service (_tmp19_);
+ publishing_ui_publishing_dialog_unlock_service (_tmp18_);
#line 90 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp20_ = self->priv->active_publisher;
+ _tmp19_ = self->priv->active_publisher;
#line 90 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- spit_publishing_publisher_stop (_tmp20_);
+ spit_publishing_publisher_stop (_tmp19_);
#line 95 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
spit_publishing_concrete_publishing_host_clean_up (self);
#line 80 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_free0 (msg);
-#line 688 "PublishingPluginHost.c"
+#line 734 "PublishingPluginHost.c"
}
-static void spit_publishing_concrete_publishing_host_real_stop_publishing (SpitPublishingPluginHost* base) {
+static void
+spit_publishing_concrete_publishing_host_real_stop_publishing (SpitPublishingPluginHost* base)
+{
SpitPublishingConcretePublishingHost * self;
SpitPublishingPublisher* _tmp0_;
- gboolean _tmp1_;
#line 98 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
#line 99 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -701,53 +748,52 @@ static void spit_publishing_concrete_publishing_host_real_stop_publishing (SpitP
#line 101 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp0_ = self->priv->active_publisher;
#line 101 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp1_ = spit_publishing_publisher_is_running (_tmp0_);
-#line 101 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- if (_tmp1_) {
-#line 706 "PublishingPluginHost.c"
- SpitPublishingPublisher* _tmp2_;
+ if (spit_publishing_publisher_is_running (_tmp0_)) {
+#line 751 "PublishingPluginHost.c"
+ SpitPublishingPublisher* _tmp1_;
#line 102 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp2_ = self->priv->active_publisher;
+ _tmp1_ = self->priv->active_publisher;
#line 102 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- spit_publishing_publisher_stop (_tmp2_);
-#line 712 "PublishingPluginHost.c"
+ spit_publishing_publisher_stop (_tmp1_);
+#line 757 "PublishingPluginHost.c"
}
#line 104 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
spit_publishing_concrete_publishing_host_clean_up (self);
#line 106 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self->priv->publishing_halted = TRUE;
-#line 718 "PublishingPluginHost.c"
+#line 763 "PublishingPluginHost.c"
}
-void spit_publishing_concrete_publishing_host_start_publishing (SpitPublishingConcretePublishingHost* self) {
+void
+spit_publishing_concrete_publishing_host_start_publishing (SpitPublishingConcretePublishingHost* self)
+{
SpitPublishingPublisher* _tmp0_;
- gboolean _tmp1_;
- SpitPublishingPublisher* _tmp2_;
+ SpitPublishingPublisher* _tmp1_;
#line 109 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self));
#line 110 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp0_ = self->priv->active_publisher;
#line 110 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp1_ = spit_publishing_publisher_is_running (_tmp0_);
-#line 110 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- if (_tmp1_) {
+ if (spit_publishing_publisher_is_running (_tmp0_)) {
#line 111 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return;
-#line 736 "PublishingPluginHost.c"
+#line 780 "PublishingPluginHost.c"
}
#line 113 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
g_debug ("PublishingPluginHost.vala:113: ConcretePublishingHost.start_publishing" \
"( ): invoked.");
#line 115 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp2_ = self->priv->active_publisher;
+ _tmp1_ = self->priv->active_publisher;
#line 115 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- spit_publishing_publisher_start (_tmp2_);
-#line 744 "PublishingPluginHost.c"
+ spit_publishing_publisher_start (_tmp1_);
+#line 788 "PublishingPluginHost.c"
}
-static SpitPublishingPublisher* spit_publishing_concrete_publishing_host_real_get_publisher (SpitPublishingPluginHost* base) {
+static SpitPublishingPublisher*
+spit_publishing_concrete_publishing_host_real_get_publisher (SpitPublishingPluginHost* base)
+{
SpitPublishingConcretePublishingHost * self;
SpitPublishingPublisher* result = NULL;
SpitPublishingPublisher* _tmp0_;
@@ -762,110 +808,107 @@ static SpitPublishingPublisher* spit_publishing_concrete_publishing_host_real_ge
result = _tmp1_;
#line 119 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return result;
-#line 763 "PublishingPluginHost.c"
+#line 809 "PublishingPluginHost.c"
}
-static void spit_publishing_concrete_publishing_host_real_install_static_message_pane (SpitPublishingPluginHost* base, const gchar* message, SpitPublishingPluginHostButtonMode button_mode) {
+static void
+spit_publishing_concrete_publishing_host_real_install_static_message_pane (SpitPublishingPluginHost* base,
+ const gchar* message,
+ SpitPublishingPluginHostButtonMode button_mode)
+{
SpitPublishingConcretePublishingHost * self;
- SpitPublishingPluginHostButtonMode _tmp0_;
- PublishingUIPublishingDialog* _tmp1_;
- const gchar* _tmp2_;
- PublishingUIStaticMessagePane* _tmp3_;
- PublishingUIStaticMessagePane* _tmp4_;
+ PublishingUIPublishingDialog* _tmp0_;
+ PublishingUIStaticMessagePane* _tmp1_;
+ PublishingUIStaticMessagePane* _tmp2_;
#line 122 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
#line 122 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
g_return_if_fail (message != NULL);
#line 125 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp0_ = button_mode;
-#line 125 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- spit_publishing_concrete_publishing_host_set_button_mode (self, _tmp0_);
+ spit_publishing_concrete_publishing_host_set_button_mode (self, button_mode);
#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp1_ = self->priv->dialog;
-#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp2_ = message;
+ _tmp0_ = self->priv->dialog;
#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp3_ = publishing_ui_static_message_pane_new (_tmp2_, FALSE);
+ _tmp1_ = publishing_ui_static_message_pane_new (message, FALSE);
#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp4_ = _tmp3_;
+ _tmp2_ = _tmp1_;
#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- publishing_ui_publishing_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
+ publishing_ui_publishing_dialog_install_pane (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _g_object_unref0 (_tmp4_);
-#line 794 "PublishingPluginHost.c"
+ _g_object_unref0 (_tmp2_);
+#line 838 "PublishingPluginHost.c"
}
-static void spit_publishing_concrete_publishing_host_real_install_pango_message_pane (SpitPublishingPluginHost* base, const gchar* markup, SpitPublishingPluginHostButtonMode button_mode) {
+static void
+spit_publishing_concrete_publishing_host_real_install_pango_message_pane (SpitPublishingPluginHost* base,
+ const gchar* markup,
+ SpitPublishingPluginHostButtonMode button_mode)
+{
SpitPublishingConcretePublishingHost * self;
- SpitPublishingPluginHostButtonMode _tmp0_;
- PublishingUIPublishingDialog* _tmp1_;
- const gchar* _tmp2_;
- PublishingUIStaticMessagePane* _tmp3_;
- PublishingUIStaticMessagePane* _tmp4_;
+ PublishingUIPublishingDialog* _tmp0_;
+ PublishingUIStaticMessagePane* _tmp1_;
+ PublishingUIStaticMessagePane* _tmp2_;
#line 130 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
#line 130 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
g_return_if_fail (markup != NULL);
#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp0_ = button_mode;
-#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- spit_publishing_concrete_publishing_host_set_button_mode (self, _tmp0_);
-#line 134 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp1_ = self->priv->dialog;
+ spit_publishing_concrete_publishing_host_set_button_mode (self, button_mode);
#line 134 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp2_ = markup;
+ _tmp0_ = self->priv->dialog;
#line 134 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp3_ = publishing_ui_static_message_pane_new (_tmp2_, TRUE);
+ _tmp1_ = publishing_ui_static_message_pane_new (markup, TRUE);
#line 134 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp4_ = _tmp3_;
+ _tmp2_ = _tmp1_;
#line 134 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- publishing_ui_publishing_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
+ publishing_ui_publishing_dialog_install_pane (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
#line 134 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _g_object_unref0 (_tmp4_);
-#line 825 "PublishingPluginHost.c"
+ _g_object_unref0 (_tmp2_);
+#line 867 "PublishingPluginHost.c"
}
-static void spit_publishing_concrete_publishing_host_real_install_success_pane (SpitPublishingPluginHost* base) {
+static void
+spit_publishing_concrete_publishing_host_real_install_success_pane (SpitPublishingPluginHost* base)
+{
SpitPublishingConcretePublishingHost * self;
PublishingUIPublishingDialog* _tmp0_;
- SpitPublishingPublisherMediaType _tmp1_;
- SpitPublishingPublishable** _tmp2_;
- gint _tmp2__length1;
+ SpitPublishingPublishable** _tmp1_;
+ gint _tmp1__length1;
+ PublishingUISuccessPane* _tmp2_;
PublishingUISuccessPane* _tmp3_;
- PublishingUISuccessPane* _tmp4_;
- PublishingUIPublishingDialog* _tmp5_;
+ PublishingUIPublishingDialog* _tmp4_;
#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
#line 138 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp0_ = self->priv->dialog;
#line 138 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp1_ = spit_publishing_plugin_host_get_publishable_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost));
+ _tmp1_ = self->priv->publishables;
#line 138 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp2_ = self->priv->publishables;
+ _tmp1__length1 = self->priv->publishables_length1;
#line 138 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp2__length1 = self->priv->publishables_length1;
-#line 138 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp3_ = publishing_ui_success_pane_new (_tmp1_, _tmp2__length1);
+ _tmp2_ = publishing_ui_success_pane_new (spit_publishing_plugin_host_get_publishable_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost)), _tmp1__length1);
#line 138 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 138 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- publishing_ui_publishing_dialog_install_pane (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
+ publishing_ui_publishing_dialog_install_pane (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
#line 138 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _g_object_unref0 (_tmp4_);
+ _g_object_unref0 (_tmp3_);
#line 140 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp5_ = self->priv->dialog;
+ _tmp4_ = self->priv->dialog;
#line 140 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- publishing_ui_publishing_dialog_set_close_button_mode (_tmp5_);
+ publishing_ui_publishing_dialog_set_close_button_mode (_tmp4_);
#line 144 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
spit_publishing_concrete_publishing_host_clean_up (self);
-#line 862 "PublishingPluginHost.c"
+#line 903 "PublishingPluginHost.c"
}
-static void spit_publishing_concrete_publishing_host_real_install_account_fetch_wait_pane (SpitPublishingPluginHost* base) {
+static void
+spit_publishing_concrete_publishing_host_real_install_account_fetch_wait_pane (SpitPublishingPluginHost* base)
+{
SpitPublishingConcretePublishingHost * self;
PublishingUIPublishingDialog* _tmp0_;
PublishingUIAccountFetchWaitPane* _tmp1_;
@@ -884,11 +927,13 @@ static void spit_publishing_concrete_publishing_host_real_install_account_fetch_
_g_object_unref0 (_tmp2_);
#line 149 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
spit_publishing_concrete_publishing_host_set_button_mode (self, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 885 "PublishingPluginHost.c"
+#line 928 "PublishingPluginHost.c"
}
-static void spit_publishing_concrete_publishing_host_real_install_login_wait_pane (SpitPublishingPluginHost* base) {
+static void
+spit_publishing_concrete_publishing_host_real_install_login_wait_pane (SpitPublishingPluginHost* base)
+{
SpitPublishingConcretePublishingHost * self;
PublishingUIPublishingDialog* _tmp0_;
PublishingUILoginWaitPane* _tmp1_;
@@ -905,146 +950,141 @@ static void spit_publishing_concrete_publishing_host_real_install_login_wait_pan
publishing_ui_publishing_dialog_install_pane (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
#line 153 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (_tmp2_);
-#line 906 "PublishingPluginHost.c"
+#line 951 "PublishingPluginHost.c"
}
-static void _spit_publishing_concrete_publishing_host_on_login_clicked_publishing_ui_login_welcome_pane_login_requested (PublishingUILoginWelcomePane* _sender, gpointer self) {
+static void
+_spit_publishing_concrete_publishing_host_on_login_clicked_publishing_ui_login_welcome_pane_login_requested (PublishingUILoginWelcomePane* _sender,
+ gpointer self)
+{
#line 160 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
spit_publishing_concrete_publishing_host_on_login_clicked ((SpitPublishingConcretePublishingHost*) self);
-#line 913 "PublishingPluginHost.c"
+#line 961 "PublishingPluginHost.c"
}
-static void spit_publishing_concrete_publishing_host_real_install_welcome_pane (SpitPublishingPluginHost* base, const gchar* welcome_message, SpitPublishingLoginCallback login_clicked_callback, void* login_clicked_callback_target) {
+static void
+spit_publishing_concrete_publishing_host_real_install_welcome_pane (SpitPublishingPluginHost* base,
+ const gchar* welcome_message,
+ SpitPublishingLoginCallback login_clicked_callback,
+ void* login_clicked_callback_target)
+{
SpitPublishingConcretePublishingHost * self;
PublishingUILoginWelcomePane* login_pane = NULL;
- const gchar* _tmp0_;
- PublishingUILoginWelcomePane* _tmp1_;
- SpitPublishingLoginCallback _tmp2_;
- void* _tmp2__target;
- PublishingUIPublishingDialog* _tmp3_;
+ PublishingUILoginWelcomePane* _tmp0_;
+ PublishingUIPublishingDialog* _tmp1_;
#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
g_return_if_fail (welcome_message != NULL);
#line 157 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp0_ = welcome_message;
-#line 157 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp1_ = publishing_ui_login_welcome_pane_new (_tmp0_);
+ _tmp0_ = publishing_ui_login_welcome_pane_new (welcome_message);
#line 157 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- login_pane = _tmp1_;
+ login_pane = _tmp0_;
#line 159 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp2_ = login_clicked_callback;
+ self->priv->current_login_callback = login_clicked_callback;
#line 159 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp2__target = login_clicked_callback_target;
-#line 159 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- self->priv->current_login_callback = _tmp2_;
-#line 159 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- self->priv->current_login_callback_target = _tmp2__target;
+ self->priv->current_login_callback_target = login_clicked_callback_target;
#line 160 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
g_signal_connect_object (login_pane, "login-requested", (GCallback) _spit_publishing_concrete_publishing_host_on_login_clicked_publishing_ui_login_welcome_pane_login_requested, self, 0);
#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
spit_publishing_concrete_publishing_host_set_button_mode (self, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
#line 164 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp3_ = self->priv->dialog;
+ _tmp1_ = self->priv->dialog;
#line 164 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- publishing_ui_publishing_dialog_install_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (login_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
+ publishing_ui_publishing_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (login_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (login_pane);
-#line 953 "PublishingPluginHost.c"
+#line 997 "PublishingPluginHost.c"
}
-static void spit_publishing_concrete_publishing_host_real_set_service_locked (SpitPublishingPluginHost* base, gboolean locked) {
+static void
+spit_publishing_concrete_publishing_host_real_set_service_locked (SpitPublishingPluginHost* base,
+ gboolean locked)
+{
SpitPublishingConcretePublishingHost * self;
- gboolean _tmp0_;
#line 167 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp0_ = locked;
-#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- if (_tmp0_) {
-#line 966 "PublishingPluginHost.c"
- PublishingUIPublishingDialog* _tmp1_;
+ if (locked) {
+#line 1010 "PublishingPluginHost.c"
+ PublishingUIPublishingDialog* _tmp0_;
#line 169 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp1_ = self->priv->dialog;
+ _tmp0_ = self->priv->dialog;
#line 169 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- publishing_ui_publishing_dialog_lock_service (_tmp1_);
-#line 972 "PublishingPluginHost.c"
+ publishing_ui_publishing_dialog_lock_service (_tmp0_);
+#line 1016 "PublishingPluginHost.c"
} else {
- PublishingUIPublishingDialog* _tmp2_;
+ PublishingUIPublishingDialog* _tmp1_;
#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp2_ = self->priv->dialog;
+ _tmp1_ = self->priv->dialog;
#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- publishing_ui_publishing_dialog_unlock_service (_tmp2_);
-#line 979 "PublishingPluginHost.c"
+ publishing_ui_publishing_dialog_unlock_service (_tmp1_);
+#line 1023 "PublishingPluginHost.c"
}
}
-void spit_publishing_concrete_publishing_host_set_button_mode (SpitPublishingConcretePublishingHost* self, SpitPublishingPluginHostButtonMode mode) {
- SpitPublishingPluginHostButtonMode _tmp0_;
+void
+spit_publishing_concrete_publishing_host_set_button_mode (SpitPublishingConcretePublishingHost* self,
+ SpitPublishingPluginHostButtonMode mode)
+{
#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self));
#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp0_ = mode;
-#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- if (_tmp0_ == SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE) {
-#line 992 "PublishingPluginHost.c"
- PublishingUIPublishingDialog* _tmp1_;
+ if (mode == SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE) {
+#line 1036 "PublishingPluginHost.c"
+ PublishingUIPublishingDialog* _tmp0_;
#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp1_ = self->priv->dialog;
+ _tmp0_ = self->priv->dialog;
#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- publishing_ui_publishing_dialog_set_close_button_mode (_tmp1_);
-#line 998 "PublishingPluginHost.c"
+ publishing_ui_publishing_dialog_set_close_button_mode (_tmp0_);
+#line 1042 "PublishingPluginHost.c"
} else {
- SpitPublishingPluginHostButtonMode _tmp2_;
#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp2_ = mode;
-#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- if (_tmp2_ == SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL) {
-#line 1005 "PublishingPluginHost.c"
- PublishingUIPublishingDialog* _tmp3_;
+ if (mode == SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL) {
+#line 1046 "PublishingPluginHost.c"
+ PublishingUIPublishingDialog* _tmp1_;
#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp3_ = self->priv->dialog;
+ _tmp1_ = self->priv->dialog;
#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- publishing_ui_publishing_dialog_set_cancel_button_mode (_tmp3_);
-#line 1011 "PublishingPluginHost.c"
+ publishing_ui_publishing_dialog_set_cancel_button_mode (_tmp1_);
+#line 1052 "PublishingPluginHost.c"
} else {
#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
g_error ("PublishingPluginHost.vala:180: unrecognized button mode enumeration va" \
"lue");
-#line 1015 "PublishingPluginHost.c"
+#line 1056 "PublishingPluginHost.c"
}
}
}
-static void spit_publishing_concrete_publishing_host_real_set_dialog_default_widget (SpitPublishingPluginHost* base, GtkWidget* widget) {
+static void
+spit_publishing_concrete_publishing_host_real_set_dialog_default_widget (SpitPublishingPluginHost* base,
+ GtkWidget* widget)
+{
SpitPublishingConcretePublishingHost * self;
- GtkWidget* _tmp0_;
- PublishingUIPublishingDialog* _tmp1_;
- GtkWidget* _tmp2_;
+ PublishingUIPublishingDialog* _tmp0_;
#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
g_return_if_fail (GTK_IS_WIDGET (widget));
#line 184 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp0_ = widget;
-#line 184 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- gtk_widget_set_can_default (_tmp0_, TRUE);
-#line 185 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp1_ = self->priv->dialog;
+ gtk_widget_set_can_default (widget, TRUE);
#line 185 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp2_ = widget;
+ _tmp0_ = self->priv->dialog;
#line 185 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow), _tmp2_);
-#line 1040 "PublishingPluginHost.c"
+ gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_window_get_type (), GtkWindow), widget);
+#line 1078 "PublishingPluginHost.c"
}
-static SpitPublishingPublisherMediaType spit_publishing_concrete_publishing_host_real_get_publishable_media_type (SpitPublishingPluginHost* base) {
+static SpitPublishingPublisherMediaType
+spit_publishing_concrete_publishing_host_real_get_publishable_media_type (SpitPublishingPluginHost* base)
+{
SpitPublishingConcretePublishingHost * self;
SpitPublishingPublisherMediaType result = 0;
SpitPublishingPublisherMediaType _tmp0_;
@@ -1056,32 +1096,38 @@ static SpitPublishingPublisherMediaType spit_publishing_concrete_publishing_host
result = _tmp0_;
#line 189 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return result;
-#line 1056 "PublishingPluginHost.c"
+#line 1096 "PublishingPluginHost.c"
}
-static SpitPublishingPublishable** _vala_array_dup21 (SpitPublishingPublishable** self, int length) {
+static SpitPublishingPublishable**
+_vala_array_dup19 (SpitPublishingPublishable** self,
+ int length)
+{
SpitPublishingPublishable** result;
int i;
#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
result = g_new0 (SpitPublishingPublishable*, length + 1);
#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
for (i = 0; i < length; i++) {
-#line 1067 "PublishingPluginHost.c"
+#line 1110 "PublishingPluginHost.c"
SpitPublishingPublishable* _tmp0_;
#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
result[i] = _tmp0_;
-#line 1073 "PublishingPluginHost.c"
+#line 1116 "PublishingPluginHost.c"
}
#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return result;
-#line 1077 "PublishingPluginHost.c"
+#line 1120 "PublishingPluginHost.c"
}
-static SpitPublishingPublishable** spit_publishing_concrete_publishing_host_real_get_publishables (SpitPublishingPluginHost* base, int* result_length1) {
+static SpitPublishingPublishable**
+spit_publishing_concrete_publishing_host_real_get_publishables (SpitPublishingPluginHost* base,
+ int* result_length1)
+{
SpitPublishingConcretePublishingHost * self;
SpitPublishingPublishable** result = NULL;
SpitPublishingPublishable** _tmp0_;
@@ -1097,7 +1143,7 @@ static SpitPublishingPublishable** spit_publishing_concrete_publishing_host_real
#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp0__length1 = self->priv->publishables_length1;
#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup21 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+ _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup19 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp1__length1 = _tmp0__length1;
#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1108,24 +1154,34 @@ static SpitPublishingPublishable** spit_publishing_concrete_publishing_host_real
if (result_length1) {
#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
*result_length1 = _tmp2__length1;
-#line 1108 "PublishingPluginHost.c"
+#line 1154 "PublishingPluginHost.c"
}
#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
result = _tmp2_;
#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return result;
-#line 1114 "PublishingPluginHost.c"
+#line 1160 "PublishingPluginHost.c"
}
-static void _spit_publishing_concrete_publishing_host_report_plugin_upload_progress_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
+static void
+_spit_publishing_concrete_publishing_host_report_plugin_upload_progress_spit_publishing_progress_callback (gint file_number,
+ gdouble fraction_complete,
+ gpointer self)
+{
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
spit_publishing_concrete_publishing_host_report_plugin_upload_progress ((SpitPublishingConcretePublishingHost*) self, file_number, fraction_complete);
-#line 1121 "PublishingPluginHost.c"
+#line 1171 "PublishingPluginHost.c"
}
-static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_real_serialize_publishables (SpitPublishingPluginHost* base, gint content_major_axis, gboolean strip_metadata, void** result_target, GDestroyNotify* result_target_destroy_notify) {
+static SpitPublishingProgressCallback
+spit_publishing_concrete_publishing_host_real_serialize_publishables (SpitPublishingPluginHost* base,
+ gint content_major_axis,
+ gboolean strip_metadata,
+ void** result_target,
+ GDestroyNotify* result_target_destroy_notify)
+{
SpitPublishingConcretePublishingHost * self;
SpitPublishingProgressCallback result = NULL;
PublishingUIProgressPane* progress_pane = NULL;
@@ -1134,9 +1190,9 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
gint i = 0;
SpitPublishingPublishable** _tmp2_;
gint _tmp2__length1;
- SpitPublishingProgressCallback _tmp25_;
- void* _tmp25__target;
- GDestroyNotify _tmp25__target_destroy_notify;
+ SpitPublishingProgressCallback _tmp22_;
+ void* _tmp22__target;
+ GDestroyNotify _tmp22__target_destroy_notify;
GError * _inner_error_ = NULL;
#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
@@ -1156,7 +1212,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
_tmp2_ = self->priv->publishables;
#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp2__length1 = self->priv->publishables_length1;
-#line 1156 "PublishingPluginHost.c"
+#line 1212 "PublishingPluginHost.c"
{
SpitPublishingPublishable** publishable_collection = NULL;
gint publishable_collection_length1 = 0;
@@ -1168,106 +1224,97 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
publishable_collection_length1 = _tmp2__length1;
#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
for (publishable_it = 0; publishable_it < _tmp2__length1; publishable_it = publishable_it + 1) {
-#line 1168 "PublishingPluginHost.c"
+#line 1224 "PublishingPluginHost.c"
SpitPublishingPublishable* _tmp3_;
SpitPublishingPublishable* publishable = NULL;
#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp3_ = _g_object_ref0 (publishable_collection[publishable_it]);
#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
publishable = _tmp3_;
-#line 1175 "PublishingPluginHost.c"
+#line 1231 "PublishingPluginHost.c"
{
gboolean _tmp4_ = FALSE;
gboolean _tmp5_;
gdouble phase_fraction_complete = 0.0;
- gint _tmp18_;
- SpitPublishingPublishable** _tmp19_;
- gint _tmp19__length1;
+ gint _tmp15_;
+ SpitPublishingPublishable** _tmp16_;
+ gint _tmp16__length1;
gdouble fraction_complete = 0.0;
+ gdouble _tmp17_;
+ gdouble _tmp18_;
+ PublishingUIProgressPane* _tmp19_;
gdouble _tmp20_;
- gdouble _tmp21_;
- PublishingUIProgressPane* _tmp22_;
- gdouble _tmp23_;
- gint _tmp24_;
+ gint _tmp21_;
#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp5_ = self->priv->publishing_halted;
#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
if (_tmp5_) {
#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp4_ = TRUE;
-#line 1195 "PublishingPluginHost.c"
+#line 1251 "PublishingPluginHost.c"
} else {
SpitPublishingPublisher* _tmp6_;
- gboolean _tmp7_;
#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp6_ = self->priv->active_publisher;
#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp7_ = spit_publishing_publisher_is_running (_tmp6_);
-#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp4_ = !_tmp7_;
-#line 1205 "PublishingPluginHost.c"
+ _tmp4_ = !spit_publishing_publisher_is_running (_tmp6_);
+#line 1258 "PublishingPluginHost.c"
}
#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
if (_tmp4_) {
-#line 1209 "PublishingPluginHost.c"
- SpitPublishingProgressCallback _tmp8_;
- void* _tmp8__target;
- GDestroyNotify _tmp8__target_destroy_notify;
+#line 1262 "PublishingPluginHost.c"
+ SpitPublishingProgressCallback _tmp7_;
+ void* _tmp7__target;
+ GDestroyNotify _tmp7__target_destroy_notify;
#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp8_ = NULL;
+ _tmp7_ = NULL;
#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp8__target = NULL;
+ _tmp7__target = NULL;
#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp8__target_destroy_notify = NULL;
+ _tmp7__target_destroy_notify = NULL;
#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- *result_target = _tmp8__target;
+ *result_target = _tmp7__target;
#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- *result_target_destroy_notify = _tmp8__target_destroy_notify;
+ *result_target_destroy_notify = _tmp7__target_destroy_notify;
#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- result = _tmp8_;
+ result = _tmp7_;
#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (publishable);
#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (progress_pane);
#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return result;
-#line 1231 "PublishingPluginHost.c"
+#line 1284 "PublishingPluginHost.c"
}
{
PublishingGlueMediaSourcePublishableWrapper* wrapper = NULL;
- SpitPublishingPublishable* _tmp9_;
+ SpitPublishingPublishable* _tmp8_;
+ PublishingGlueMediaSourcePublishableWrapper* _tmp9_;
PublishingGlueMediaSourcePublishableWrapper* _tmp10_;
- PublishingGlueMediaSourcePublishableWrapper* _tmp11_;
- gint _tmp12_;
- gboolean _tmp13_;
- GFile* _tmp14_;
- GFile* _tmp15_;
+ GFile* _tmp11_;
+ GFile* _tmp12_;
#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp9_ = publishable;
+ _tmp8_ = publishable;
#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper));
+ _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper));
#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- wrapper = _tmp10_;
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp11_ = wrapper;
+ wrapper = _tmp9_;
#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp12_ = content_major_axis;
+ _tmp10_ = wrapper;
#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp13_ = strip_metadata;
+ _tmp11_ = publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (_tmp10_, content_major_axis, strip_metadata, &_inner_error_);
#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp14_ = publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (_tmp11_, _tmp12_, _tmp13_, &_inner_error_);
+ _tmp12_ = _tmp11_;
#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp15_ = _tmp14_;
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _g_object_unref0 (_tmp15_);
+ _g_object_unref0 (_tmp12_);
#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (wrapper);
#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1266 "PublishingPluginHost.c"
- goto __catch38_spit_publishing_publishing_error;
+#line 1313 "PublishingPluginHost.c"
+ goto __catch42_spit_publishing_publishing_error;
}
#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (wrapper);
@@ -1281,40 +1328,40 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
g_clear_error (&_inner_error_);
#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return NULL;
-#line 1281 "PublishingPluginHost.c"
+#line 1328 "PublishingPluginHost.c"
}
#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (wrapper);
-#line 1285 "PublishingPluginHost.c"
+#line 1332 "PublishingPluginHost.c"
}
- goto __finally38;
- __catch38_spit_publishing_publishing_error:
+ goto __finally42;
+ __catch42_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp16_;
- SpitPublishingProgressCallback _tmp17_;
- void* _tmp17__target;
- GDestroyNotify _tmp17__target_destroy_notify;
+ GError* _tmp13_;
+ SpitPublishingProgressCallback _tmp14_;
+ void* _tmp14__target;
+ GDestroyNotify _tmp14__target_destroy_notify;
#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
err = _inner_error_;
#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_inner_error_ = NULL;
#line 217 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp16_ = err;
+ _tmp13_ = err;
#line 217 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- spit_publishing_plugin_host_post_error (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost), _tmp16_);
+ spit_publishing_plugin_host_post_error (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost), _tmp13_);
#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp17_ = NULL;
+ _tmp14_ = NULL;
#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp17__target = NULL;
+ _tmp14__target = NULL;
#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp17__target_destroy_notify = NULL;
+ _tmp14__target_destroy_notify = NULL;
#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- *result_target = _tmp17__target;
+ *result_target = _tmp14__target;
#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- *result_target_destroy_notify = _tmp17__target_destroy_notify;
+ *result_target_destroy_notify = _tmp14__target_destroy_notify;
#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- result = _tmp17_;
+ result = _tmp14_;
#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_error_free0 (err);
#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1323,9 +1370,9 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
_g_object_unref0 (progress_pane);
#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return result;
-#line 1323 "PublishingPluginHost.c"
+#line 1370 "PublishingPluginHost.c"
}
- __finally38:
+ __finally42:
#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1338,75 +1385,79 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
g_clear_error (&_inner_error_);
#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return NULL;
-#line 1338 "PublishingPluginHost.c"
+#line 1385 "PublishingPluginHost.c"
}
#line 221 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp18_ = i;
+ _tmp15_ = i;
#line 221 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp19_ = self->priv->publishables;
+ _tmp16_ = self->priv->publishables;
#line 221 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp19__length1 = self->priv->publishables_length1;
+ _tmp16__length1 = self->priv->publishables_length1;
#line 221 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- phase_fraction_complete = ((gdouble) (_tmp18_ + 1)) / ((gdouble) _tmp19__length1);
+ phase_fraction_complete = ((gdouble) (_tmp15_ + 1)) / ((gdouble) _tmp16__length1);
#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp20_ = phase_fraction_complete;
+ _tmp17_ = phase_fraction_complete;
#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- fraction_complete = _tmp20_ * SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_STATUS_PREPARATION_FRACTION;
+ fraction_complete = _tmp17_ * SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_STATUS_PREPARATION_FRACTION;
#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp21_ = fraction_complete;
+ _tmp18_ = fraction_complete;
#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
g_debug ("PublishingPluginHost.vala:224: serialize_publishables( ): fraction_com" \
-"plete = %f.", _tmp21_);
+"plete = %f.", _tmp18_);
#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp22_ = progress_pane;
+ _tmp19_ = progress_pane;
#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp23_ = fraction_complete;
+ _tmp20_ = fraction_complete;
#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- publishing_ui_progress_pane_set_status (_tmp22_, SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_PREPARE_STATUS_DESCRIPTION, _tmp23_);
+ publishing_ui_progress_pane_set_status (_tmp19_, SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_PREPARE_STATUS_DESCRIPTION, _tmp20_);
#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
spin_event_loop ();
#line 230 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp24_ = i;
+ _tmp21_ = i;
#line 230 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- i = _tmp24_ + 1;
+ i = _tmp21_ + 1;
#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (publishable);
-#line 1370 "PublishingPluginHost.c"
+#line 1417 "PublishingPluginHost.c"
}
}
}
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp25_ = _spit_publishing_concrete_publishing_host_report_plugin_upload_progress_spit_publishing_progress_callback;
+ _tmp22_ = _spit_publishing_concrete_publishing_host_report_plugin_upload_progress_spit_publishing_progress_callback;
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp25__target = g_object_ref (self);
+ _tmp22__target = g_object_ref (self);
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp25__target_destroy_notify = g_object_unref;
+ _tmp22__target_destroy_notify = g_object_unref;
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- *result_target = _tmp25__target;
+ *result_target = _tmp22__target;
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- *result_target_destroy_notify = _tmp25__target_destroy_notify;
+ *result_target_destroy_notify = _tmp22__target_destroy_notify;
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- result = _tmp25_;
+ result = _tmp22_;
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (progress_pane);
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return result;
-#line 1390 "PublishingPluginHost.c"
+#line 1437 "PublishingPluginHost.c"
}
-static void spit_publishing_concrete_publishing_host_class_init (SpitPublishingConcretePublishingHostClass * klass) {
+static void
+spit_publishing_concrete_publishing_host_class_init (SpitPublishingConcretePublishingHostClass * klass)
+{
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
spit_publishing_concrete_publishing_host_parent_class = g_type_class_peek_parent (klass);
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
g_type_class_add_private (klass, sizeof (SpitPublishingConcretePublishingHostPrivate));
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
G_OBJECT_CLASS (klass)->finalize = spit_publishing_concrete_publishing_host_finalize;
-#line 1401 "PublishingPluginHost.c"
+#line 1450 "PublishingPluginHost.c"
}
-static void spit_publishing_concrete_publishing_host_spit_publishing_plugin_host_interface_init (SpitPublishingPluginHostIface * iface) {
+static void
+spit_publishing_concrete_publishing_host_spit_publishing_plugin_host_interface_init (SpitPublishingPluginHostIface * iface)
+{
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
spit_publishing_concrete_publishing_host_spit_publishing_plugin_host_parent_iface = g_type_interface_peek_parent (iface);
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1439,11 +1490,13 @@ static void spit_publishing_concrete_publishing_host_spit_publishing_plugin_host
iface->get_publishables = (SpitPublishingPublishable** (*) (SpitPublishingPluginHost *, int*)) spit_publishing_concrete_publishing_host_real_get_publishables;
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
iface->serialize_publishables = (SpitPublishingProgressCallback (*) (SpitPublishingPluginHost *, gint, gboolean, void**, GDestroyNotify*)) spit_publishing_concrete_publishing_host_real_serialize_publishables;
-#line 1438 "PublishingPluginHost.c"
+#line 1489 "PublishingPluginHost.c"
}
-static void spit_publishing_concrete_publishing_host_instance_init (SpitPublishingConcretePublishingHost * self) {
+static void
+spit_publishing_concrete_publishing_host_instance_init (SpitPublishingConcretePublishingHost * self)
+{
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self->priv = SPIT_PUBLISHING_CONCRETE_PUBLISHING_HOST_GET_PRIVATE (self);
#line 16 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1464,11 +1517,13 @@ static void spit_publishing_concrete_publishing_host_instance_init (SpitPublishi
self->priv->publishing_halted = FALSE;
#line 21 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self->priv->media_type = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_NONE;
-#line 1463 "PublishingPluginHost.c"
+#line 1516 "PublishingPluginHost.c"
}
-static void spit_publishing_concrete_publishing_host_finalize (GObject * obj) {
+static void
+spit_publishing_concrete_publishing_host_finalize (GObject * obj)
+{
SpitPublishingConcretePublishingHost * self;
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
@@ -1478,11 +1533,13 @@ static void spit_publishing_concrete_publishing_host_finalize (GObject * obj) {
self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
G_OBJECT_CLASS (spit_publishing_concrete_publishing_host_parent_class)->finalize (obj);
-#line 1477 "PublishingPluginHost.c"
+#line 1532 "PublishingPluginHost.c"
}
-GType spit_publishing_concrete_publishing_host_get_type (void) {
+GType
+spit_publishing_concrete_publishing_host_get_type (void)
+{
static volatile gsize spit_publishing_concrete_publishing_host_type_id__volatile = 0;
if (g_once_init_enter (&spit_publishing_concrete_publishing_host_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (SpitPublishingConcretePublishingHostClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) spit_publishing_concrete_publishing_host_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SpitPublishingConcretePublishingHost), 0, (GInstanceInitFunc) spit_publishing_concrete_publishing_host_instance_init, NULL };
@@ -1496,7 +1553,11 @@ GType spit_publishing_concrete_publishing_host_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) {
@@ -1508,7 +1569,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);
}
diff --git a/src/publishing/PublishingUI.c b/src/publishing/PublishingUI.c
index a0fe079..218b1ff 100644
--- a/src/publishing/PublishingUI.c
+++ b/src/publishing/PublishingUI.c
@@ -1,4 +1,4 @@
-/* PublishingUI.c generated by valac 0.36.6, the Vala compiler
+/* PublishingUI.c generated by valac 0.40.4, the Vala compiler
* generated from PublishingUI.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 <glib.h>
#include <glib-object.h>
#include "shotwell-plugin-dev-1.0.h"
@@ -31,6 +32,11 @@
typedef struct _PublishingUIConcreteDialogPane PublishingUIConcreteDialogPane;
typedef struct _PublishingUIConcreteDialogPaneClass PublishingUIConcreteDialogPaneClass;
typedef struct _PublishingUIConcreteDialogPanePrivate PublishingUIConcreteDialogPanePrivate;
+enum {
+ PUBLISHING_UI_CONCRETE_DIALOG_PANE_0_PROPERTY,
+ PUBLISHING_UI_CONCRETE_DIALOG_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_ui_concrete_dialog_pane_properties[PUBLISHING_UI_CONCRETE_DIALOG_PANE_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define PUBLISHING_UI_TYPE_STATIC_MESSAGE_PANE (publishing_ui_static_message_pane_get_type ())
@@ -43,6 +49,11 @@ typedef struct _PublishingUIConcreteDialogPanePrivate PublishingUIConcreteDialog
typedef struct _PublishingUIStaticMessagePane PublishingUIStaticMessagePane;
typedef struct _PublishingUIStaticMessagePaneClass PublishingUIStaticMessagePaneClass;
typedef struct _PublishingUIStaticMessagePanePrivate PublishingUIStaticMessagePanePrivate;
+enum {
+ PUBLISHING_UI_STATIC_MESSAGE_PANE_0_PROPERTY,
+ PUBLISHING_UI_STATIC_MESSAGE_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_ui_static_message_pane_properties[PUBLISHING_UI_STATIC_MESSAGE_PANE_NUM_PROPERTIES];
#define PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE (publishing_ui_login_welcome_pane_get_type ())
#define PUBLISHING_UI_LOGIN_WELCOME_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, PublishingUILoginWelcomePane))
@@ -55,10 +66,15 @@ typedef struct _PublishingUILoginWelcomePane PublishingUILoginWelcomePane;
typedef struct _PublishingUILoginWelcomePaneClass PublishingUILoginWelcomePaneClass;
typedef struct _PublishingUILoginWelcomePanePrivate PublishingUILoginWelcomePanePrivate;
enum {
+ PUBLISHING_UI_LOGIN_WELCOME_PANE_0_PROPERTY,
+ PUBLISHING_UI_LOGIN_WELCOME_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_ui_login_welcome_pane_properties[PUBLISHING_UI_LOGIN_WELCOME_PANE_NUM_PROPERTIES];
+enum {
PUBLISHING_UI_LOGIN_WELCOME_PANE_LOGIN_REQUESTED_SIGNAL,
- PUBLISHING_UI_LOGIN_WELCOME_PANE_LAST_SIGNAL
+ PUBLISHING_UI_LOGIN_WELCOME_PANE_NUM_SIGNALS
};
-static guint publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOME_PANE_LAST_SIGNAL] = {0};
+static guint publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOME_PANE_NUM_SIGNALS] = {0};
#define PUBLISHING_UI_TYPE_PROGRESS_PANE (publishing_ui_progress_pane_get_type ())
#define PUBLISHING_UI_PROGRESS_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_UI_TYPE_PROGRESS_PANE, PublishingUIProgressPane))
@@ -70,6 +86,11 @@ static guint publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOM
typedef struct _PublishingUIProgressPane PublishingUIProgressPane;
typedef struct _PublishingUIProgressPaneClass PublishingUIProgressPaneClass;
typedef struct _PublishingUIProgressPanePrivate PublishingUIProgressPanePrivate;
+enum {
+ PUBLISHING_UI_PROGRESS_PANE_0_PROPERTY,
+ PUBLISHING_UI_PROGRESS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_ui_progress_pane_properties[PUBLISHING_UI_PROGRESS_PANE_NUM_PROPERTIES];
#define PUBLISHING_UI_TYPE_SUCCESS_PANE (publishing_ui_success_pane_get_type ())
#define PUBLISHING_UI_SUCCESS_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_UI_TYPE_SUCCESS_PANE, PublishingUISuccessPane))
@@ -81,6 +102,11 @@ typedef struct _PublishingUIProgressPanePrivate PublishingUIProgressPanePrivate;
typedef struct _PublishingUISuccessPane PublishingUISuccessPane;
typedef struct _PublishingUISuccessPaneClass PublishingUISuccessPaneClass;
typedef struct _PublishingUISuccessPanePrivate PublishingUISuccessPanePrivate;
+enum {
+ PUBLISHING_UI_SUCCESS_PANE_0_PROPERTY,
+ PUBLISHING_UI_SUCCESS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_ui_success_pane_properties[PUBLISHING_UI_SUCCESS_PANE_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
#define PUBLISHING_UI_TYPE_ACCOUNT_FETCH_WAIT_PANE (publishing_ui_account_fetch_wait_pane_get_type ())
@@ -93,6 +119,11 @@ typedef struct _PublishingUISuccessPanePrivate PublishingUISuccessPanePrivate;
typedef struct _PublishingUIAccountFetchWaitPane PublishingUIAccountFetchWaitPane;
typedef struct _PublishingUIAccountFetchWaitPaneClass PublishingUIAccountFetchWaitPaneClass;
typedef struct _PublishingUIAccountFetchWaitPanePrivate PublishingUIAccountFetchWaitPanePrivate;
+enum {
+ PUBLISHING_UI_ACCOUNT_FETCH_WAIT_PANE_0_PROPERTY,
+ PUBLISHING_UI_ACCOUNT_FETCH_WAIT_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_ui_account_fetch_wait_pane_properties[PUBLISHING_UI_ACCOUNT_FETCH_WAIT_PANE_NUM_PROPERTIES];
#define PUBLISHING_UI_TYPE_LOGIN_WAIT_PANE (publishing_ui_login_wait_pane_get_type ())
#define PUBLISHING_UI_LOGIN_WAIT_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_UI_TYPE_LOGIN_WAIT_PANE, PublishingUILoginWaitPane))
@@ -104,6 +135,11 @@ typedef struct _PublishingUIAccountFetchWaitPanePrivate PublishingUIAccountFetch
typedef struct _PublishingUILoginWaitPane PublishingUILoginWaitPane;
typedef struct _PublishingUILoginWaitPaneClass PublishingUILoginWaitPaneClass;
typedef struct _PublishingUILoginWaitPanePrivate PublishingUILoginWaitPanePrivate;
+enum {
+ PUBLISHING_UI_LOGIN_WAIT_PANE_0_PROPERTY,
+ PUBLISHING_UI_LOGIN_WAIT_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_ui_login_wait_pane_properties[PUBLISHING_UI_LOGIN_WAIT_PANE_NUM_PROPERTIES];
#define PUBLISHING_UI_TYPE_PUBLISHING_DIALOG (publishing_ui_publishing_dialog_get_type ())
#define PUBLISHING_UI_PUBLISHING_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, PublishingUIPublishingDialog))
@@ -135,6 +171,11 @@ typedef struct _PluginsStandardHostInterfaceClass PluginsStandardHostInterfaceCl
typedef struct _SpitPublishingConcretePublishingHost SpitPublishingConcretePublishingHost;
typedef struct _SpitPublishingConcretePublishingHostClass SpitPublishingConcretePublishingHostClass;
+enum {
+ PUBLISHING_UI_PUBLISHING_DIALOG_0_PROPERTY,
+ PUBLISHING_UI_PUBLISHING_DIALOG_NUM_PROPERTIES
+};
+static GParamSpec* publishing_ui_publishing_dialog_properties[PUBLISHING_UI_PUBLISHING_DIALOG_NUM_PROPERTIES];
#define TYPE_DATA_OBJECT (data_object_get_type ())
#define DATA_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_OBJECT, DataObject))
@@ -399,12 +440,10 @@ static gboolean publishing_ui_publishing_dialog_elapsed_is_valid;
static gboolean publishing_ui_publishing_dialog_elapsed_is_valid = FALSE;
GType publishing_ui_concrete_dialog_pane_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_UI_CONCRETE_DIALOG_PANE_DUMMY_PROPERTY
-};
PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_new (void);
PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_construct (GType object_type);
-GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user);
+GtkBuilder* app_window_create_builder (const gchar* glade_filename,
+ void* user);
static GtkWidget* publishing_ui_concrete_dialog_pane_real_get_widget (SpitPublishingDialogPane* base);
static SpitPublishingDialogPaneGeometryOptions publishing_ui_concrete_dialog_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
static void publishing_ui_concrete_dialog_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
@@ -412,58 +451,49 @@ static void publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitPub
static void publishing_ui_concrete_dialog_pane_finalize (GObject * obj);
GType publishing_ui_static_message_pane_get_type (void) G_GNUC_CONST;
#define PUBLISHING_UI_STATIC_MESSAGE_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_UI_TYPE_STATIC_MESSAGE_PANE, PublishingUIStaticMessagePanePrivate))
-enum {
- PUBLISHING_UI_STATIC_MESSAGE_PANE_DUMMY_PROPERTY
-};
-PublishingUIStaticMessagePane* publishing_ui_static_message_pane_new (const gchar* message_string, gboolean enable_markup);
-PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GType object_type, const gchar* message_string, gboolean enable_markup);
+PublishingUIStaticMessagePane* publishing_ui_static_message_pane_new (const gchar* message_string,
+ gboolean enable_markup);
+PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GType object_type,
+ const gchar* message_string,
+ gboolean enable_markup);
static void publishing_ui_static_message_pane_finalize (GObject * obj);
GType publishing_ui_login_welcome_pane_get_type (void) G_GNUC_CONST;
#define PUBLISHING_UI_LOGIN_WELCOME_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, PublishingUILoginWelcomePanePrivate))
-enum {
- PUBLISHING_UI_LOGIN_WELCOME_PANE_DUMMY_PROPERTY
-};
PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_new (const gchar* service_welcome_message);
-PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType object_type, const gchar* service_welcome_message);
+PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType object_type,
+ const gchar* service_welcome_message);
static void publishing_ui_login_welcome_pane_on_login_clicked (PublishingUILoginWelcomePane* self);
-static void _publishing_ui_login_welcome_pane_on_login_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_ui_login_welcome_pane_on_login_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_ui_login_welcome_pane_finalize (GObject * obj);
GType publishing_ui_progress_pane_get_type (void) G_GNUC_CONST;
#define PUBLISHING_UI_PROGRESS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_UI_TYPE_PROGRESS_PANE, PublishingUIProgressPanePrivate))
-enum {
- PUBLISHING_UI_PROGRESS_PANE_DUMMY_PROPERTY
-};
PublishingUIProgressPane* publishing_ui_progress_pane_new (void);
PublishingUIProgressPane* publishing_ui_progress_pane_construct (GType object_type);
-void publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self, const gchar* text);
-void publishing_ui_progress_pane_set_progress (PublishingUIProgressPane* self, gdouble progress);
-void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, const gchar* status_text, gdouble progress);
+void publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self,
+ const gchar* text);
+void publishing_ui_progress_pane_set_progress (PublishingUIProgressPane* self,
+ gdouble progress);
+void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self,
+ const gchar* status_text,
+ gdouble progress);
static void publishing_ui_progress_pane_finalize (GObject * obj);
GType publishing_ui_success_pane_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_UI_SUCCESS_PANE_DUMMY_PROPERTY
-};
-PublishingUISuccessPane* publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media, gint num_uploaded);
-PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type, SpitPublishingPublisherMediaType published_media, gint num_uploaded);
+PublishingUISuccessPane* publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media,
+ gint num_uploaded);
+PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type,
+ SpitPublishingPublisherMediaType published_media,
+ gint num_uploaded);
GType publishing_ui_account_fetch_wait_pane_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_UI_ACCOUNT_FETCH_WAIT_PANE_DUMMY_PROPERTY
-};
PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_new (void);
PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_construct (GType object_type);
GType publishing_ui_login_wait_pane_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_UI_LOGIN_WAIT_PANE_DUMMY_PROPERTY
-};
PublishingUILoginWaitPane* publishing_ui_login_wait_pane_new (void);
PublishingUILoginWaitPane* publishing_ui_login_wait_pane_construct (GType object_type);
GType publishing_ui_publishing_dialog_get_type (void) G_GNUC_CONST;
GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST;
GType spit_publishing_concrete_publishing_host_get_type (void) G_GNUC_CONST;
#define PUBLISHING_UI_PUBLISHING_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, PublishingUIPublishingDialogPrivate))
-enum {
- PUBLISHING_UI_PUBLISHING_DIALOG_DUMMY_PROPERTY
-};
#define PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH 860
#define PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT 688
#define PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH 1024
@@ -479,51 +509,97 @@ 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;
PublishingUIPublishingDialog* publishing_ui_publishing_dialog_new (GeeCollection* to_publish);
-PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType object_type, GeeCollection* to_publish);
+PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType object_type,
+ GeeCollection* to_publish);
+gint resources_use_header_bar (void);
GType page_window_get_type (void) G_GNUC_CONST;
GType app_window_get_type (void) G_GNUC_CONST;
AppWindow* app_window_get_instance (void);
-static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPublishingDialog* self, GdkEventAny* evt);
-static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
+static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPublishingDialog* self,
+ GdkEventAny* evt);
+static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender,
+ GdkEventAny* event,
+ gpointer self);
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);
GType publishing_glue_media_source_publishable_wrapper_get_type (void) G_GNUC_CONST;
-static void _vala_array_add55 (SpitPublishingPublishable** * array, int* length, int* size, SpitPublishingPublishable* value);
+static void _vala_array_add58 (SpitPublishingPublishable** * array,
+ int* length,
+ int* size,
+ SpitPublishingPublishable* value);
GType configuration_facade_get_type (void) G_GNUC_CONST;
GType config_facade_get_type (void) G_GNUC_CONST;
ConfigFacade* config_facade_get_instance (void);
gchar* configuration_facade_get_last_used_service (ConfigurationFacade* self);
-static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gboolean has_photos, gboolean has_videos, int* result_length1);
-GdkPixbuf* resources_get_icon (const gchar* name, gint scale);
+static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gboolean has_photos,
+ gboolean has_videos,
+ int* result_length1);
+GdkPixbuf* resources_get_icon (const gchar* name,
+ gint scale);
#define RESOURCES_ICON_GENERIC_PLUGIN "generic-plugin.png"
#define RESOURCES_DEFAULT_ICON_SCALE 24
static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPublishingDialog* self);
-static void _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self);
static void publishing_ui_publishing_dialog_on_close_cancel_clicked (PublishingUIPublishingDialog* self);
-static void _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
static void publishing_ui_publishing_dialog_set_standard_window_mode (PublishingUIPublishingDialog* self);
static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services (int* result_length1);
-GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled);
+GeeCollection* plugins_get_pluggables_for_type (GType type,
+ GCompareDataFunc compare_func,
+ void* compare_func_target,
+ GDestroyNotify compare_func_target_destroy_notify,
+ gboolean include_disabled);
gchar* plugins_get_pluggable_module_id (SpitPluggable* needle);
-static void _vala_array_add56 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value);
-static gint __lambda15_ (void* a, void* b);
-gint utf8_cs_compare (void* a, void* b);
-static gint ___lambda15____compar_fn_t (void* key1, void* key2);
-static void _vala_array_add57 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value);
-static void _vala_array_add58 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value);
-static void _vala_array_add59 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value);
+static void _vala_array_add59 (SpitPublishingService** * array,
+ int* length,
+ int* size,
+ SpitPublishingService* value);
+static gint __lambda16_ (void* a,
+ void* b);
+gint utf8_cs_compare (void* a,
+ void* b);
+static gint ___lambda16____compar_fn_t (void* key1,
+ void* key2);
+static void _vala_array_add60 (SpitPublishingService** * array,
+ int* length,
+ int* size,
+ SpitPublishingService* value);
+static void _vala_array_add61 (SpitPublishingService** * array,
+ int* length,
+ int* size,
+ SpitPublishingService* value);
+static void _vala_array_add62 (SpitPublishingService** * array,
+ int* length,
+ int* size,
+ SpitPublishingService* value);
void publishing_ui_publishing_dialog_go (GeeCollection* to_publish);
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;
GType video_source_get_type (void) G_GNUC_CONST;
GType video_get_type (void) G_GNUC_CONST;
-void media_source_collection_filter_media (GeeCollection* media, GeeCollection* photos, GeeCollection* videos);
-void app_window_error_message_with_title (const gchar* title, const gchar* message, GtkWindow* parent, gboolean should_escape);
+void media_source_collection_filter_media (GeeCollection* media,
+ GeeCollection* photos,
+ GeeCollection* videos);
+void app_window_error_message_with_title (const gchar* title,
+ const gchar* message,
+ GtkWindow* parent,
+ gboolean should_escape);
gint publishing_ui_publishing_dialog_run (PublishingUIPublishingDialog* self);
-void configuration_facade_set_last_used_service (ConfigurationFacade* self, const gchar* service_name);
-SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_new (SpitPublishingService* service, PublishingUIPublishingDialog* dialog, SpitPublishingPublishable** publishables, int publishables_length1);
-SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_construct (GType object_type, SpitPublishingService* service, PublishingUIPublishingDialog* dialog, SpitPublishingPublishable** publishables, int publishables_length1);
+void configuration_facade_set_last_used_service (ConfigurationFacade* self,
+ const gchar* service_name);
+SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_new (SpitPublishingService* service,
+ PublishingUIPublishingDialog* dialog,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1);
+SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_construct (GType object_type,
+ SpitPublishingService* service,
+ PublishingUIPublishingDialog* dialog,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1);
void spit_publishing_concrete_publishing_host_start_publishing (SpitPublishingConcretePublishingHost* self);
static void publishing_ui_publishing_dialog_set_large_window_mode (PublishingUIPublishingDialog* self);
static void publishing_ui_publishing_dialog_set_colossal_window_mode (PublishingUIPublishingDialog* self);
@@ -534,13 +610,20 @@ void publishing_ui_publishing_dialog_set_close_button_mode (PublishingUIPublishi
void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublishingDialog* self);
void publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* self);
void publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialog* self);
-void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* self, SpitPublishingDialogPane* pane);
+void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* self,
+ SpitPublishingDialogPane* pane);
static void publishing_ui_publishing_dialog_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);
-PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_construct (GType object_type) {
+PublishingUIConcreteDialogPane*
+publishing_ui_concrete_dialog_pane_construct (GType object_type)
+{
PublishingUIConcreteDialogPane * self = NULL;
GtkBuilder* _tmp0_;
#line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -553,25 +636,31 @@ PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_construct (GT
self->builder = _tmp0_;
#line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 557 "PublishingUI.c"
+#line 640 "PublishingUI.c"
}
-PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_new (void) {
+PublishingUIConcreteDialogPane*
+publishing_ui_concrete_dialog_pane_new (void)
+{
#line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_concrete_dialog_pane_construct (PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE);
-#line 564 "PublishingUI.c"
+#line 649 "PublishingUI.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 18 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self ? g_object_ref (self) : NULL;
-#line 571 "PublishingUI.c"
+#line 658 "PublishingUI.c"
}
-static GtkWidget* publishing_ui_concrete_dialog_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_ui_concrete_dialog_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
PublishingUIConcreteDialogPane * self;
GtkWidget* result = NULL;
GtkBox* _tmp0_;
@@ -586,11 +675,13 @@ static GtkWidget* publishing_ui_concrete_dialog_pane_real_get_widget (SpitPublis
result = _tmp1_;
#line 18 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 590 "PublishingUI.c"
+#line 679 "PublishingUI.c"
}
-static SpitPublishingDialogPaneGeometryOptions publishing_ui_concrete_dialog_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_ui_concrete_dialog_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
PublishingUIConcreteDialogPane * self;
SpitPublishingDialogPaneGeometryOptions result = 0;
#line 21 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -599,36 +690,44 @@ static SpitPublishingDialogPaneGeometryOptions publishing_ui_concrete_dialog_pan
result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
#line 22 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 603 "PublishingUI.c"
+#line 694 "PublishingUI.c"
}
-static void publishing_ui_concrete_dialog_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_ui_concrete_dialog_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
PublishingUIConcreteDialogPane * self;
#line 25 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane);
-#line 611 "PublishingUI.c"
+#line 704 "PublishingUI.c"
}
-static void publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
PublishingUIConcreteDialogPane * self;
#line 28 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane);
-#line 619 "PublishingUI.c"
+#line 714 "PublishingUI.c"
}
-static void publishing_ui_concrete_dialog_pane_class_init (PublishingUIConcreteDialogPaneClass * klass) {
+static void
+publishing_ui_concrete_dialog_pane_class_init (PublishingUIConcreteDialogPaneClass * klass)
+{
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_concrete_dialog_pane_parent_class = g_type_class_peek_parent (klass);
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_ui_concrete_dialog_pane_finalize;
-#line 628 "PublishingUI.c"
+#line 725 "PublishingUI.c"
}
-static void publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -639,20 +738,24 @@ static void publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_inter
iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_ui_concrete_dialog_pane_real_on_pane_installed;
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled;
-#line 643 "PublishingUI.c"
+#line 742 "PublishingUI.c"
}
-static void publishing_ui_concrete_dialog_pane_instance_init (PublishingUIConcreteDialogPane * self) {
+static void
+publishing_ui_concrete_dialog_pane_instance_init (PublishingUIConcreteDialogPane * self)
+{
#line 10 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->pane_widget = NULL;
#line 11 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->builder = NULL;
-#line 652 "PublishingUI.c"
+#line 753 "PublishingUI.c"
}
-static void publishing_ui_concrete_dialog_pane_finalize (GObject * obj) {
+static void
+publishing_ui_concrete_dialog_pane_finalize (GObject * obj)
+{
PublishingUIConcreteDialogPane * self;
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane);
@@ -662,11 +765,13 @@ static void publishing_ui_concrete_dialog_pane_finalize (GObject * obj) {
_g_object_unref0 (self->builder);
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (publishing_ui_concrete_dialog_pane_parent_class)->finalize (obj);
-#line 666 "PublishingUI.c"
+#line 769 "PublishingUI.c"
}
-GType publishing_ui_concrete_dialog_pane_get_type (void) {
+GType
+publishing_ui_concrete_dialog_pane_get_type (void)
+{
static volatile gsize publishing_ui_concrete_dialog_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_ui_concrete_dialog_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingUIConcreteDialogPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_ui_concrete_dialog_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingUIConcreteDialogPane), 0, (GInstanceInitFunc) publishing_ui_concrete_dialog_pane_instance_init, NULL };
@@ -680,7 +785,11 @@ GType publishing_ui_concrete_dialog_pane_get_type (void) {
}
-PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GType object_type, const gchar* message_string, gboolean enable_markup) {
+PublishingUIStaticMessagePane*
+publishing_ui_static_message_pane_construct (GType object_type,
+ const gchar* message_string,
+ gboolean enable_markup)
+{
PublishingUIStaticMessagePane * self = NULL;
GtkBuilder* _tmp0_;
GObject* _tmp1_;
@@ -688,7 +797,6 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp
GtkBuilder* _tmp3_;
GObject* _tmp4_;
GtkBox* _tmp5_;
- gboolean _tmp6_;
#line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_val_if_fail (message_string != NULL, NULL);
#line 36 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -714,74 +822,75 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp
#line 38 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane)->pane_widget = _tmp5_;
#line 40 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp6_ = enable_markup;
-#line 40 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp6_) {
-#line 721 "PublishingUI.c"
+ if (enable_markup) {
+#line 827 "PublishingUI.c"
+ GtkLabel* _tmp6_;
GtkLabel* _tmp7_;
- const gchar* _tmp8_;
- GtkLabel* _tmp9_;
- GtkLabel* _tmp10_;
+ GtkLabel* _tmp8_;
#line 41 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp7_ = self->priv->msg_label;
-#line 41 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp8_ = message_string;
+ _tmp6_ = self->priv->msg_label;
#line 41 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_label_set_markup (_tmp7_, _tmp8_);
+ gtk_label_set_markup (_tmp6_, message_string);
#line 42 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp9_ = self->priv->msg_label;
+ _tmp7_ = self->priv->msg_label;
#line 42 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_label_set_line_wrap (_tmp9_, TRUE);
+ gtk_label_set_line_wrap (_tmp7_, TRUE);
#line 43 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp10_ = self->priv->msg_label;
+ _tmp8_ = self->priv->msg_label;
#line 43 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_label_set_use_markup (_tmp10_, TRUE);
-#line 740 "PublishingUI.c"
+ gtk_label_set_use_markup (_tmp8_, TRUE);
+#line 843 "PublishingUI.c"
} else {
- GtkLabel* _tmp11_;
- const gchar* _tmp12_;
-#line 45 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp11_ = self->priv->msg_label;
+ GtkLabel* _tmp9_;
#line 45 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp12_ = message_string;
+ _tmp9_ = self->priv->msg_label;
#line 45 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_label_set_label (_tmp11_, _tmp12_);
-#line 750 "PublishingUI.c"
+ gtk_label_set_label (_tmp9_, message_string);
+#line 850 "PublishingUI.c"
}
#line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 754 "PublishingUI.c"
+#line 854 "PublishingUI.c"
}
-PublishingUIStaticMessagePane* publishing_ui_static_message_pane_new (const gchar* message_string, gboolean enable_markup) {
+PublishingUIStaticMessagePane*
+publishing_ui_static_message_pane_new (const gchar* message_string,
+ gboolean enable_markup)
+{
#line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_static_message_pane_construct (PUBLISHING_UI_TYPE_STATIC_MESSAGE_PANE, message_string, enable_markup);
-#line 761 "PublishingUI.c"
+#line 864 "PublishingUI.c"
}
-static void publishing_ui_static_message_pane_class_init (PublishingUIStaticMessagePaneClass * klass) {
+static void
+publishing_ui_static_message_pane_class_init (PublishingUIStaticMessagePaneClass * klass)
+{
#line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_static_message_pane_parent_class = g_type_class_peek_parent (klass);
#line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_type_class_add_private (klass, sizeof (PublishingUIStaticMessagePanePrivate));
#line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_ui_static_message_pane_finalize;
-#line 772 "PublishingUI.c"
+#line 877 "PublishingUI.c"
}
-static void publishing_ui_static_message_pane_instance_init (PublishingUIStaticMessagePane * self) {
+static void
+publishing_ui_static_message_pane_instance_init (PublishingUIStaticMessagePane * self)
+{
#line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv = PUBLISHING_UI_STATIC_MESSAGE_PANE_GET_PRIVATE (self);
#line 33 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->msg_label = NULL;
-#line 781 "PublishingUI.c"
+#line 888 "PublishingUI.c"
}
-static void publishing_ui_static_message_pane_finalize (GObject * obj) {
+static void
+publishing_ui_static_message_pane_finalize (GObject * obj)
+{
PublishingUIStaticMessagePane * self;
#line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_STATIC_MESSAGE_PANE, PublishingUIStaticMessagePane);
@@ -789,11 +898,13 @@ static void publishing_ui_static_message_pane_finalize (GObject * obj) {
_g_object_unref0 (self->priv->msg_label);
#line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (publishing_ui_static_message_pane_parent_class)->finalize (obj);
-#line 793 "PublishingUI.c"
+#line 902 "PublishingUI.c"
}
-GType publishing_ui_static_message_pane_get_type (void) {
+GType
+publishing_ui_static_message_pane_get_type (void)
+{
static volatile gsize publishing_ui_static_message_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_ui_static_message_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingUIStaticMessagePaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_ui_static_message_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingUIStaticMessagePane), 0, (GInstanceInitFunc) publishing_ui_static_message_pane_instance_init, NULL };
@@ -805,14 +916,20 @@ GType publishing_ui_static_message_pane_get_type (void) {
}
-static void _publishing_ui_login_welcome_pane_on_login_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_ui_login_welcome_pane_on_login_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 62 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_login_welcome_pane_on_login_clicked ((PublishingUILoginWelcomePane*) self);
-#line 812 "PublishingUI.c"
+#line 926 "PublishingUI.c"
}
-PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType object_type, const gchar* service_welcome_message) {
+PublishingUILoginWelcomePane*
+publishing_ui_login_welcome_pane_construct (GType object_type,
+ const gchar* service_welcome_message)
+{
PublishingUILoginWelcomePane * self = NULL;
GtkBuilder* _tmp0_;
GObject* _tmp1_;
@@ -826,7 +943,6 @@ PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType
GtkButton* _tmp9_;
GtkLabel* _tmp10_;
GtkLabel* _tmp11_;
- const gchar* _tmp12_;
#line 56 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_val_if_fail (service_welcome_message != NULL, NULL);
#line 57 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -872,32 +988,36 @@ PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType
#line 64 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp11_ = self->priv->not_logged_in_label;
#line 64 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp12_ = service_welcome_message;
-#line 64 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_label_set_markup (_tmp11_, _tmp12_);
+ gtk_label_set_markup (_tmp11_, service_welcome_message);
#line 56 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 881 "PublishingUI.c"
+#line 995 "PublishingUI.c"
}
-PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_new (const gchar* service_welcome_message) {
+PublishingUILoginWelcomePane*
+publishing_ui_login_welcome_pane_new (const gchar* service_welcome_message)
+{
#line 56 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_login_welcome_pane_construct (PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, service_welcome_message);
-#line 888 "PublishingUI.c"
+#line 1004 "PublishingUI.c"
}
-static void publishing_ui_login_welcome_pane_on_login_clicked (PublishingUILoginWelcomePane* self) {
+static void
+publishing_ui_login_welcome_pane_on_login_clicked (PublishingUILoginWelcomePane* self)
+{
#line 67 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_LOGIN_WELCOME_PANE (self));
#line 68 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_signal_emit (self, publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOME_PANE_LOGIN_REQUESTED_SIGNAL], 0);
-#line 897 "PublishingUI.c"
+#line 1015 "PublishingUI.c"
}
-static void publishing_ui_login_welcome_pane_class_init (PublishingUILoginWelcomePaneClass * klass) {
+static void
+publishing_ui_login_welcome_pane_class_init (PublishingUILoginWelcomePaneClass * klass)
+{
#line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_login_welcome_pane_parent_class = g_type_class_peek_parent (klass);
#line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -906,22 +1026,26 @@ static void publishing_ui_login_welcome_pane_class_init (PublishingUILoginWelcom
G_OBJECT_CLASS (klass)->finalize = publishing_ui_login_welcome_pane_finalize;
#line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOME_PANE_LOGIN_REQUESTED_SIGNAL] = g_signal_new ("login-requested", PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 910 "PublishingUI.c"
+#line 1030 "PublishingUI.c"
}
-static void publishing_ui_login_welcome_pane_instance_init (PublishingUILoginWelcomePane * self) {
+static void
+publishing_ui_login_welcome_pane_instance_init (PublishingUILoginWelcomePane * self)
+{
#line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv = PUBLISHING_UI_LOGIN_WELCOME_PANE_GET_PRIVATE (self);
#line 51 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->login_button = NULL;
#line 52 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->not_logged_in_label = NULL;
-#line 921 "PublishingUI.c"
+#line 1043 "PublishingUI.c"
}
-static void publishing_ui_login_welcome_pane_finalize (GObject * obj) {
+static void
+publishing_ui_login_welcome_pane_finalize (GObject * obj)
+{
PublishingUILoginWelcomePane * self;
#line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, PublishingUILoginWelcomePane);
@@ -931,11 +1055,13 @@ static void publishing_ui_login_welcome_pane_finalize (GObject * obj) {
_g_object_unref0 (self->priv->not_logged_in_label);
#line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (publishing_ui_login_welcome_pane_parent_class)->finalize (obj);
-#line 935 "PublishingUI.c"
+#line 1059 "PublishingUI.c"
}
-GType publishing_ui_login_welcome_pane_get_type (void) {
+GType
+publishing_ui_login_welcome_pane_get_type (void)
+{
static volatile gsize publishing_ui_login_welcome_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_ui_login_welcome_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingUILoginWelcomePaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_ui_login_welcome_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingUILoginWelcomePane), 0, (GInstanceInitFunc) publishing_ui_login_welcome_pane_instance_init, NULL };
@@ -947,7 +1073,9 @@ GType publishing_ui_login_welcome_pane_get_type (void) {
}
-PublishingUIProgressPane* publishing_ui_progress_pane_construct (GType object_type) {
+PublishingUIProgressPane*
+publishing_ui_progress_pane_construct (GType object_type)
+{
PublishingUIProgressPane * self = NULL;
GtkBuilder* _tmp0_;
GObject* _tmp1_;
@@ -979,20 +1107,24 @@ PublishingUIProgressPane* publishing_ui_progress_pane_construct (GType object_ty
self->priv->progress_bar = _tmp5_;
#line 75 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 983 "PublishingUI.c"
+#line 1111 "PublishingUI.c"
}
-PublishingUIProgressPane* publishing_ui_progress_pane_new (void) {
+PublishingUIProgressPane*
+publishing_ui_progress_pane_new (void)
+{
#line 75 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_progress_pane_construct (PUBLISHING_UI_TYPE_PROGRESS_PANE);
-#line 990 "PublishingUI.c"
+#line 1120 "PublishingUI.c"
}
-void publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self, const gchar* text) {
+void
+publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self,
+ const gchar* text)
+{
GtkProgressBar* _tmp0_;
- const gchar* _tmp1_;
#line 81 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PROGRESS_PANE (self));
#line 81 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1000,85 +1132,84 @@ void publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self, const
#line 82 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->progress_bar;
#line 82 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp1_ = text;
-#line 82 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 1007 "PublishingUI.c"
+ gtk_progress_bar_set_text (_tmp0_, text);
+#line 1137 "PublishingUI.c"
}
-void publishing_ui_progress_pane_set_progress (PublishingUIProgressPane* self, gdouble progress) {
+void
+publishing_ui_progress_pane_set_progress (PublishingUIProgressPane* self,
+ gdouble progress)
+{
GtkProgressBar* _tmp0_;
- gdouble _tmp1_;
#line 85 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PROGRESS_PANE (self));
#line 86 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->progress_bar;
#line 86 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp1_ = progress;
-#line 86 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_progress_bar_set_fraction (_tmp0_, _tmp1_);
-#line 1022 "PublishingUI.c"
+ gtk_progress_bar_set_fraction (_tmp0_, progress);
+#line 1152 "PublishingUI.c"
}
-void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, const gchar* status_text, gdouble progress) {
- const gchar* _tmp0_;
- GtkProgressBar* _tmp1_;
- const gchar* _tmp2_;
- gdouble _tmp5_;
+void
+publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self,
+ const gchar* status_text,
+ gdouble progress)
+{
+ GtkProgressBar* _tmp0_;
+ const gchar* _tmp1_;
#line 89 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PROGRESS_PANE (self));
#line 89 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (status_text != NULL);
#line 90 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp0_ = status_text;
-#line 90 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp1_ = self->priv->progress_bar;
+ _tmp0_ = self->priv->progress_bar;
#line 90 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp2_ = gtk_progress_bar_get_text (_tmp1_);
+ _tmp1_ = gtk_progress_bar_get_text (_tmp0_);
#line 90 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (g_strcmp0 (_tmp0_, _tmp2_) != 0) {
-#line 1043 "PublishingUI.c"
- GtkProgressBar* _tmp3_;
- const gchar* _tmp4_;
-#line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp3_ = self->priv->progress_bar;
+ if (g_strcmp0 (status_text, _tmp1_) != 0) {
+#line 1173 "PublishingUI.c"
+ GtkProgressBar* _tmp2_;
#line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp4_ = status_text;
+ _tmp2_ = self->priv->progress_bar;
#line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_progress_bar_set_text (_tmp3_, _tmp4_);
-#line 1052 "PublishingUI.c"
+ gtk_progress_bar_set_text (_tmp2_, status_text);
+#line 1179 "PublishingUI.c"
}
#line 93 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp5_ = progress;
-#line 93 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- publishing_ui_progress_pane_set_progress (self, _tmp5_);
-#line 1058 "PublishingUI.c"
+ publishing_ui_progress_pane_set_progress (self, progress);
+#line 1183 "PublishingUI.c"
}
-static void publishing_ui_progress_pane_class_init (PublishingUIProgressPaneClass * klass) {
+static void
+publishing_ui_progress_pane_class_init (PublishingUIProgressPaneClass * klass)
+{
#line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_progress_pane_parent_class = g_type_class_peek_parent (klass);
#line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_type_class_add_private (klass, sizeof (PublishingUIProgressPanePrivate));
#line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_ui_progress_pane_finalize;
-#line 1069 "PublishingUI.c"
+#line 1196 "PublishingUI.c"
}
-static void publishing_ui_progress_pane_instance_init (PublishingUIProgressPane * self) {
+static void
+publishing_ui_progress_pane_instance_init (PublishingUIProgressPane * self)
+{
#line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv = PUBLISHING_UI_PROGRESS_PANE_GET_PRIVATE (self);
#line 73 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->progress_bar = NULL;
-#line 1078 "PublishingUI.c"
+#line 1207 "PublishingUI.c"
}
-static void publishing_ui_progress_pane_finalize (GObject * obj) {
+static void
+publishing_ui_progress_pane_finalize (GObject * obj)
+{
PublishingUIProgressPane * self;
#line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_PROGRESS_PANE, PublishingUIProgressPane);
@@ -1086,11 +1217,13 @@ static void publishing_ui_progress_pane_finalize (GObject * obj) {
_g_object_unref0 (self->priv->progress_bar);
#line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (publishing_ui_progress_pane_parent_class)->finalize (obj);
-#line 1090 "PublishingUI.c"
+#line 1221 "PublishingUI.c"
}
-GType publishing_ui_progress_pane_get_type (void) {
+GType
+publishing_ui_progress_pane_get_type (void)
+{
static volatile gsize publishing_ui_progress_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_ui_progress_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingUIProgressPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_ui_progress_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingUIProgressPane), 0, (GInstanceInitFunc) publishing_ui_progress_pane_instance_init, NULL };
@@ -1102,100 +1235,98 @@ GType publishing_ui_progress_pane_get_type (void) {
}
-PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type, SpitPublishingPublisherMediaType published_media, gint num_uploaded) {
+PublishingUISuccessPane*
+publishing_ui_success_pane_construct (GType object_type,
+ SpitPublishingPublisherMediaType published_media,
+ gint num_uploaded)
+{
PublishingUISuccessPane * self = NULL;
gchar* message_string = NULL;
- SpitPublishingPublisherMediaType _tmp0_;
- const gchar* _tmp8_;
+ const gchar* _tmp3_;
#line 99 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
message_string = NULL;
#line 103 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp0_ = published_media;
-#line 103 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1117 "PublishingUI.c"
- gint _tmp1_;
- gchar* _tmp2_;
+ if (published_media == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 1251 "PublishingUI.c"
+ gchar* _tmp0_;
#line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp1_ = num_uploaded;
-#line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp2_ = g_strdup (ngettext ("The selected video was successfully published.", "The selected videos were successfully published.", (gulong) _tmp1_));
+ _tmp0_ = g_strdup (ngettext ("The selected video was successfully published.", "The selected videos were successfully published.", (gulong) num_uploaded));
#line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (message_string);
#line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- message_string = _tmp2_;
-#line 1128 "PublishingUI.c"
+ message_string = _tmp0_;
+#line 1259 "PublishingUI.c"
} else {
- SpitPublishingPublisherMediaType _tmp3_;
-#line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp3_ = published_media;
#line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp3_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 1135 "PublishingUI.c"
- gint _tmp4_;
- gchar* _tmp5_;
-#line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp4_ = num_uploaded;
+ if (published_media == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
+#line 1263 "PublishingUI.c"
+ gchar* _tmp1_;
#line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp5_ = g_strdup (ngettext ("The selected photo was successfully published.", "The selected photos were successfully published.", (gulong) _tmp4_));
+ _tmp1_ = g_strdup (ngettext ("The selected photo was successfully published.", "The selected photos were successfully published.", (gulong) num_uploaded));
#line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (message_string);
#line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- message_string = _tmp5_;
-#line 1146 "PublishingUI.c"
+ message_string = _tmp1_;
+#line 1271 "PublishingUI.c"
} else {
- SpitPublishingPublisherMediaType _tmp6_;
-#line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp6_ = published_media;
#line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp6_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
-#line 1153 "PublishingUI.c"
- gchar* _tmp7_;
+ if (published_media == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
+#line 1275 "PublishingUI.c"
+ gchar* _tmp2_;
#line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp7_ = g_strdup (_ ("The selected photos/videos were successfully published."));
+ _tmp2_ = g_strdup (_ ("The selected photos/videos were successfully published."));
#line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (message_string);
#line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- message_string = _tmp7_;
-#line 1161 "PublishingUI.c"
+ message_string = _tmp2_;
+#line 1283 "PublishingUI.c"
} else {
#line 118 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_assert_not_reached ();
-#line 1165 "PublishingUI.c"
+#line 1287 "PublishingUI.c"
}
}
}
#line 121 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp8_ = message_string;
+ _tmp3_ = message_string;
#line 121 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self = (PublishingUISuccessPane*) publishing_ui_static_message_pane_construct (object_type, _tmp8_, FALSE);
+ self = (PublishingUISuccessPane*) publishing_ui_static_message_pane_construct (object_type, _tmp3_, FALSE);
#line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (message_string);
#line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 1177 "PublishingUI.c"
+#line 1299 "PublishingUI.c"
}
-PublishingUISuccessPane* publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media, gint num_uploaded) {
+PublishingUISuccessPane*
+publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media,
+ gint num_uploaded)
+{
#line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_success_pane_construct (PUBLISHING_UI_TYPE_SUCCESS_PANE, published_media, num_uploaded);
-#line 1184 "PublishingUI.c"
+#line 1309 "PublishingUI.c"
}
-static void publishing_ui_success_pane_class_init (PublishingUISuccessPaneClass * klass) {
+static void
+publishing_ui_success_pane_class_init (PublishingUISuccessPaneClass * klass)
+{
#line 97 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_success_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1191 "PublishingUI.c"
+#line 1318 "PublishingUI.c"
}
-static void publishing_ui_success_pane_instance_init (PublishingUISuccessPane * self) {
+static void
+publishing_ui_success_pane_instance_init (PublishingUISuccessPane * self)
+{
}
-GType publishing_ui_success_pane_get_type (void) {
+GType
+publishing_ui_success_pane_get_type (void)
+{
static volatile gsize publishing_ui_success_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_ui_success_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingUISuccessPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_ui_success_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingUISuccessPane), 0, (GInstanceInitFunc) publishing_ui_success_pane_instance_init, NULL };
@@ -1207,35 +1338,45 @@ GType publishing_ui_success_pane_get_type (void) {
}
-PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_construct (GType object_type) {
+PublishingUIAccountFetchWaitPane*
+publishing_ui_account_fetch_wait_pane_construct (GType object_type)
+{
PublishingUIAccountFetchWaitPane * self = NULL;
#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self = (PublishingUIAccountFetchWaitPane*) publishing_ui_static_message_pane_construct (object_type, _ ("Fetching account information…"), FALSE);
#line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 1217 "PublishingUI.c"
+#line 1350 "PublishingUI.c"
}
-PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_new (void) {
+PublishingUIAccountFetchWaitPane*
+publishing_ui_account_fetch_wait_pane_new (void)
+{
#line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_account_fetch_wait_pane_construct (PUBLISHING_UI_TYPE_ACCOUNT_FETCH_WAIT_PANE);
-#line 1224 "PublishingUI.c"
+#line 1359 "PublishingUI.c"
}
-static void publishing_ui_account_fetch_wait_pane_class_init (PublishingUIAccountFetchWaitPaneClass * klass) {
+static void
+publishing_ui_account_fetch_wait_pane_class_init (PublishingUIAccountFetchWaitPaneClass * klass)
+{
#line 125 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_account_fetch_wait_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1231 "PublishingUI.c"
+#line 1368 "PublishingUI.c"
}
-static void publishing_ui_account_fetch_wait_pane_instance_init (PublishingUIAccountFetchWaitPane * self) {
+static void
+publishing_ui_account_fetch_wait_pane_instance_init (PublishingUIAccountFetchWaitPane * self)
+{
}
-GType publishing_ui_account_fetch_wait_pane_get_type (void) {
+GType
+publishing_ui_account_fetch_wait_pane_get_type (void)
+{
static volatile gsize publishing_ui_account_fetch_wait_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_ui_account_fetch_wait_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingUIAccountFetchWaitPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_ui_account_fetch_wait_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingUIAccountFetchWaitPane), 0, (GInstanceInitFunc) publishing_ui_account_fetch_wait_pane_instance_init, NULL };
@@ -1247,35 +1388,45 @@ GType publishing_ui_account_fetch_wait_pane_get_type (void) {
}
-PublishingUILoginWaitPane* publishing_ui_login_wait_pane_construct (GType object_type) {
+PublishingUILoginWaitPane*
+publishing_ui_login_wait_pane_construct (GType object_type)
+{
PublishingUILoginWaitPane * self = NULL;
#line 133 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self = (PublishingUILoginWaitPane*) publishing_ui_static_message_pane_construct (object_type, _ ("Logging in…"), FALSE);
#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 1257 "PublishingUI.c"
+#line 1400 "PublishingUI.c"
}
-PublishingUILoginWaitPane* publishing_ui_login_wait_pane_new (void) {
+PublishingUILoginWaitPane*
+publishing_ui_login_wait_pane_new (void)
+{
#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_login_wait_pane_construct (PUBLISHING_UI_TYPE_LOGIN_WAIT_PANE);
-#line 1264 "PublishingUI.c"
+#line 1409 "PublishingUI.c"
}
-static void publishing_ui_login_wait_pane_class_init (PublishingUILoginWaitPaneClass * klass) {
+static void
+publishing_ui_login_wait_pane_class_init (PublishingUILoginWaitPaneClass * klass)
+{
#line 131 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_login_wait_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1271 "PublishingUI.c"
+#line 1418 "PublishingUI.c"
}
-static void publishing_ui_login_wait_pane_instance_init (PublishingUILoginWaitPane * self) {
+static void
+publishing_ui_login_wait_pane_instance_init (PublishingUILoginWaitPane * self)
+{
}
-GType publishing_ui_login_wait_pane_get_type (void) {
+GType
+publishing_ui_login_wait_pane_get_type (void)
+{
static volatile gsize publishing_ui_login_wait_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_ui_login_wait_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingUILoginWaitPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_ui_login_wait_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingUILoginWaitPane), 0, (GInstanceInitFunc) publishing_ui_login_wait_pane_instance_init, NULL };
@@ -1287,881 +1438,872 @@ GType publishing_ui_login_wait_pane_get_type (void) {
}
-static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
+static gboolean
+_publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender,
+ GdkEventAny* event,
+ gpointer self)
+{
gboolean result;
result = publishing_ui_publishing_dialog_on_window_close ((PublishingUIPublishingDialog*) self, event);
-#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 1296 "PublishingUI.c"
+#line 1451 "PublishingUI.c"
}
-static void _vala_array_add55 (SpitPublishingPublishable** * array, int* length, int* size, SpitPublishingPublishable* value) {
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void
+_vala_array_add58 (SpitPublishingPublishable** * array,
+ int* length,
+ int* size,
+ SpitPublishingPublishable* value)
+{
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((*length) == (*size)) {
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*array = g_renew (SpitPublishingPublishable*, *array, (*size) + 1);
-#line 1307 "PublishingUI.c"
+#line 1467 "PublishingUI.c"
}
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[(*length)++] = value;
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[*length] = NULL;
-#line 1313 "PublishingUI.c"
+#line 1473 "PublishingUI.c"
}
-static void _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void
+_publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+ gpointer self)
+{
+#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_on_service_changed ((PublishingUIPublishingDialog*) self);
-#line 1320 "PublishingUI.c"
+#line 1483 "PublishingUI.c"
}
-static void _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void
+_publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
+#line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_on_close_cancel_clicked ((PublishingUIPublishingDialog*) self);
-#line 1327 "PublishingUI.c"
+#line 1493 "PublishingUI.c"
}
-PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType object_type, GeeCollection* to_publish) {
+PublishingUIPublishingDialog*
+publishing_ui_publishing_dialog_construct (GType object_type,
+ GeeCollection* to_publish)
+{
PublishingUIPublishingDialog * self = NULL;
- GeeCollection* _tmp0_;
+ gint _tmp0_;
gint _tmp1_;
- gint _tmp2_;
gboolean use_header = FALSE;
- GtkSettings* _tmp3_;
- gint _tmp4_ = 0;
- gboolean _tmp5_;
- gboolean _tmp6_;
- AppWindow* _tmp8_;
- AppWindow* _tmp9_;
- SpitPublishingPublishable** _tmp10_;
+ gboolean _tmp2_;
+ AppWindow* _tmp5_;
+ AppWindow* _tmp6_;
+ SpitPublishingPublishable** _tmp7_;
gboolean has_photos = FALSE;
gboolean has_videos = FALSE;
gchar* title = NULL;
gchar* label = NULL;
- gboolean _tmp26_ = FALSE;
- gboolean _tmp27_;
- const gchar* _tmp38_;
- GtkListStore* _tmp39_;
- GtkListStore* _tmp40_;
- GtkComboBox* _tmp41_;
+ gboolean _tmp19_ = FALSE;
+ gboolean _tmp20_;
+ const gchar* _tmp31_;
+ GtkListStore* _tmp32_;
+ GtkListStore* _tmp33_;
+ GtkComboBox* _tmp34_;
GtkCellRendererPixbuf* renderer_pix = NULL;
- GtkCellRendererPixbuf* _tmp42_;
+ GtkCellRendererPixbuf* _tmp35_;
+ GtkComboBox* _tmp36_;
+ GtkCellRendererPixbuf* _tmp37_;
+ GtkComboBox* _tmp38_;
+ GtkCellRendererPixbuf* _tmp39_;
+ GtkCellRendererText* renderer_text = NULL;
+ GtkCellRendererText* _tmp40_;
+ GtkComboBox* _tmp41_;
+ GtkCellRendererText* _tmp42_;
GtkComboBox* _tmp43_;
- GtkCellRendererPixbuf* _tmp44_;
+ GtkCellRendererText* _tmp44_;
GtkComboBox* _tmp45_;
- GtkCellRendererPixbuf* _tmp46_;
- GtkCellRendererText* renderer_text = NULL;
- GtkCellRendererText* _tmp47_;
- GtkComboBox* _tmp48_;
- GtkCellRendererText* _tmp49_;
- GtkComboBox* _tmp50_;
- GtkCellRendererText* _tmp51_;
- GtkComboBox* _tmp52_;
gchar* last_used_service = NULL;
- ConfigFacade* _tmp53_;
- ConfigFacade* _tmp54_;
- gchar* _tmp55_;
- gchar* _tmp56_;
+ ConfigFacade* _tmp46_;
+ ConfigFacade* _tmp47_;
+ gchar* _tmp48_;
+ gchar* _tmp49_;
SpitPublishingService** loaded_services = NULL;
- gboolean _tmp57_;
- gboolean _tmp58_;
- gint _tmp59_;
- SpitPublishingService** _tmp60_;
+ gboolean _tmp50_;
+ gboolean _tmp51_;
+ gint _tmp52_;
+ SpitPublishingService** _tmp53_;
gint loaded_services_length1;
gint _loaded_services_size_;
GtkTreeIter iter = {0};
- SpitPublishingService** _tmp61_;
- gint _tmp61__length1;
- GtkComboBox* _tmp99_;
- gboolean _tmp100_;
- GtkBox* _tmp130_;
- GtkBox* _tmp131_;
- GtkBox* _tmp132_;
- gboolean _tmp133_;
- GtkButton* _tmp142_;
+ SpitPublishingService** _tmp54_;
+ gint _tmp54__length1;
+ GtkComboBox* _tmp92_;
+ gboolean _tmp93_;
+ GtkBox* _tmp123_;
+ GtkBox* _tmp124_;
+ GtkBox* _tmp125_;
+ gboolean _tmp126_;
+ GtkButton* _tmp135_;
#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (to_publish), NULL);
#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp0_ = to_publish;
-#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp1_ = gee_collection_get_size (_tmp0_);
+ _tmp0_ = gee_collection_get_size (to_publish);
#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _vala_assert (_tmp2_ > 0, "to_publish.size > 0");
+ _vala_assert (_tmp1_ > 0, "to_publish.size > 0");
#line 164 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- use_header = FALSE;
+ use_header = resources_use_header_bar () == 1;
#line 165 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp3_ = gtk_settings_get_default ();
-#line 165 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp5_ = use_header;
-#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp5_) {
-#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp4_ = 1;
-#line 1411 "PublishingUI.c"
- } else {
+ self = (PublishingUIPublishingDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL);
#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp4_ = 0;
-#line 1415 "PublishingUI.c"
- }
+ _tmp2_ = use_header;
#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self = (PublishingUIPublishingDialog*) g_object_new (object_type, "use-header-bar", _tmp4_, NULL);
+ if (_tmp2_) {
+#line 1570 "PublishingUI.c"
+ GtkWidget* _tmp3_;
#line 167 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp6_ = use_header;
+ _tmp3_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 167 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp6_) {
-#line 1423 "PublishingUI.c"
- GtkWidget* _tmp7_;
-#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp7_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE);
-#line 1429 "PublishingUI.c"
+ gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE);
+#line 1576 "PublishingUI.c"
+ } else {
+ GtkBox* _tmp4_;
+#line 169 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp4_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 169 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_box_set_spacing (_tmp4_, 6);
+#line 1583 "PublishingUI.c"
}
-#line 170 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp8_ = app_window_get_instance ();
-#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp9_ = _tmp8_;
-#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow));
-#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (_tmp9_);
+ gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event, self, 0);
-#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp10_ = g_new0 (SpitPublishingPublishable*, 0 + 1);
+ gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
+#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp5_ = app_window_get_instance ();
+#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp6_ = _tmp5_;
+#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow));
+#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (_tmp6_);
#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event, self, 0);
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp7_ = g_new0 (SpitPublishingPublishable*, 0 + 1);
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->publishables = _tmp10_;
-#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ self->priv->publishables = _tmp7_;
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->publishables_length1 = 0;
-#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->_publishables_size_ = self->priv->publishables_length1;
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
has_photos = FALSE;
-#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
has_videos = FALSE;
-#line 1459 "PublishingUI.c"
+#line 1613 "PublishingUI.c"
{
GeeIterator* _media_it = NULL;
- GeeCollection* _tmp11_;
- GeeIterator* _tmp12_;
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp11_ = to_publish;
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _media_it = _tmp12_;
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ GeeIterator* _tmp8_;
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (to_publish, GEE_TYPE_ITERABLE, GeeIterable));
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _media_it = _tmp8_;
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
while (TRUE) {
-#line 1472 "PublishingUI.c"
- GeeIterator* _tmp13_;
- gboolean _tmp14_;
+#line 1623 "PublishingUI.c"
+ GeeIterator* _tmp9_;
MediaSource* media = NULL;
- GeeIterator* _tmp15_;
- gpointer _tmp16_;
+ GeeIterator* _tmp10_;
+ gpointer _tmp11_;
SpitPublishingPublishable* publishable = NULL;
- MediaSource* _tmp17_;
- PublishingGlueMediaSourcePublishableWrapper* _tmp18_;
- SpitPublishingPublishable* _tmp19_;
- SpitPublishingPublisherMediaType _tmp20_;
- SpitPublishingPublishable** _tmp23_;
- gint _tmp23__length1;
- SpitPublishingPublishable* _tmp24_;
- SpitPublishingPublishable* _tmp25_;
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp13_ = _media_it;
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp14_ = gee_iterator_next (_tmp13_);
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (!_tmp14_) {
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ MediaSource* _tmp12_;
+ PublishingGlueMediaSourcePublishableWrapper* _tmp13_;
+ SpitPublishingPublishable* _tmp14_;
+ SpitPublishingPublishable** _tmp16_;
+ gint _tmp16__length1;
+ SpitPublishingPublishable* _tmp17_;
+ SpitPublishingPublishable* _tmp18_;
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp9_ = _media_it;
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (!gee_iterator_next (_tmp9_)) {
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
break;
-#line 1495 "PublishingUI.c"
+#line 1642 "PublishingUI.c"
}
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp15_ = _media_it;
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp16_ = gee_iterator_get (_tmp15_);
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- media = (MediaSource*) _tmp16_;
-#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp17_ = media;
-#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp18_ = publishing_glue_media_source_publishable_wrapper_new (_tmp17_);
-#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- publishable = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_PUBLISHABLE, SpitPublishingPublishable);
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp10_ = _media_it;
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp11_ = gee_iterator_get (_tmp10_);
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ media = (MediaSource*) _tmp11_;
#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp19_ = publishable;
+ _tmp12_ = media;
#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp20_ = spit_publishing_publishable_get_media_type (_tmp19_);
+ _tmp13_ = publishing_glue_media_source_publishable_wrapper_new (_tmp12_);
#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp20_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 182 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- has_photos = TRUE;
-#line 1517 "PublishingUI.c"
- } else {
- SpitPublishingPublishable* _tmp21_;
- SpitPublishingPublisherMediaType _tmp22_;
-#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp21_ = publishable;
+ publishable = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, SPIT_PUBLISHING_TYPE_PUBLISHABLE, SpitPublishingPublishable);
#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp22_ = spit_publishing_publishable_get_media_type (_tmp21_);
+ _tmp14_ = publishable;
#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp22_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+ if (spit_publishing_publishable_get_media_type (_tmp14_) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
#line 184 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ has_photos = TRUE;
+#line 1662 "PublishingUI.c"
+ } else {
+ SpitPublishingPublishable* _tmp15_;
+#line 185 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp15_ = publishable;
+#line 185 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (spit_publishing_publishable_get_media_type (_tmp15_) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
has_videos = TRUE;
-#line 1529 "PublishingUI.c"
+#line 1671 "PublishingUI.c"
} else {
-#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_assert_not_reached ();
-#line 1533 "PublishingUI.c"
+#line 1675 "PublishingUI.c"
}
}
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp23_ = self->priv->publishables;
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp23__length1 = self->priv->publishables_length1;
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp24_ = publishable;
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp25_ = _g_object_ref0 (_tmp24_);
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _vala_array_add55 (&self->priv->publishables, &self->priv->publishables_length1, &self->priv->_publishables_size_, _tmp25_);
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp16_ = self->priv->publishables;
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp16__length1 = self->priv->publishables_length1;
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp17_ = publishable;
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp18_ = _g_object_ref0 (_tmp17_);
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _vala_array_add58 (&self->priv->publishables, &self->priv->publishables_length1, &self->priv->_publishables_size_, _tmp18_);
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (publishable);
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (media);
-#line 1550 "PublishingUI.c"
+#line 1692 "PublishingUI.c"
}
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (_media_it);
-#line 1554 "PublishingUI.c"
+#line 1696 "PublishingUI.c"
}
-#line 191 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
title = NULL;
-#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- label = NULL;
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp27_ = has_photos;
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp27_) {
-#line 1564 "PublishingUI.c"
- gboolean _tmp28_;
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp28_ = has_videos;
#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp26_ = !_tmp28_;
-#line 1570 "PublishingUI.c"
- } else {
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp26_ = FALSE;
-#line 1574 "PublishingUI.c"
- }
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp26_) {
-#line 1578 "PublishingUI.c"
- gchar* _tmp29_;
- gchar* _tmp30_;
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp29_ = g_strdup (_ ("Publish Photos"));
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_free0 (title);
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- title = _tmp29_;
+ label = NULL;
#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp30_ = g_strdup (_ ("Publish photos _to:"));
+ _tmp20_ = has_photos;
#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_free0 (label);
+ if (_tmp20_) {
+#line 1706 "PublishingUI.c"
+ gboolean _tmp21_;
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp21_ = has_videos;
#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- label = _tmp30_;
-#line 1593 "PublishingUI.c"
+ _tmp19_ = !_tmp21_;
+#line 1712 "PublishingUI.c"
} else {
- gboolean _tmp31_ = FALSE;
- gboolean _tmp32_;
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp32_ = has_photos;
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (!_tmp32_) {
-#line 1601 "PublishingUI.c"
- gboolean _tmp33_;
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp33_ = has_videos;
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp19_ = FALSE;
+#line 1716 "PublishingUI.c"
+ }
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (_tmp19_) {
+#line 1720 "PublishingUI.c"
+ gchar* _tmp22_;
+ gchar* _tmp23_;
#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp31_ = _tmp33_;
-#line 1607 "PublishingUI.c"
- } else {
+ _tmp22_ = g_strdup (_ ("Publish Photos"));
#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp31_ = FALSE;
-#line 1611 "PublishingUI.c"
- }
+ _g_free0 (title);
#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp31_) {
-#line 1615 "PublishingUI.c"
- gchar* _tmp34_;
- gchar* _tmp35_;
+ title = _tmp22_;
#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp34_ = g_strdup (_ ("Publish Videos"));
+ _tmp23_ = g_strdup (_ ("Publish photos _to:"));
#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_free0 (title);
+ _g_free0 (label);
#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- title = _tmp34_;
+ label = _tmp23_;
+#line 1735 "PublishingUI.c"
+ } else {
+ gboolean _tmp24_ = FALSE;
+ gboolean _tmp25_;
#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp35_ = g_strdup (_ ("Publish videos _to"));
+ _tmp25_ = has_photos;
#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_free0 (label);
+ if (!_tmp25_) {
+#line 1743 "PublishingUI.c"
+ gboolean _tmp26_;
#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- label = _tmp35_;
-#line 1630 "PublishingUI.c"
+ _tmp26_ = has_videos;
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp24_ = _tmp26_;
+#line 1749 "PublishingUI.c"
} else {
- gchar* _tmp36_;
- gchar* _tmp37_;
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp24_ = FALSE;
+#line 1753 "PublishingUI.c"
+ }
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (_tmp24_) {
+#line 1757 "PublishingUI.c"
+ gchar* _tmp27_;
+ gchar* _tmp28_;
+#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp27_ = g_strdup (_ ("Publish Videos"));
+#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_free0 (title);
+#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ title = _tmp27_;
#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp36_ = g_strdup (_ ("Publish Photos and Videos"));
+ _tmp28_ = g_strdup (_ ("Publish videos _to"));
#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_free0 (title);
+ _g_free0 (label);
#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- title = _tmp36_;
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp37_ = g_strdup (_ ("Publish photos and videos _to"));
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ label = _tmp28_;
+#line 1772 "PublishingUI.c"
+ } else {
+ gchar* _tmp29_;
+ gchar* _tmp30_;
+#line 203 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp29_ = g_strdup (_ ("Publish Photos and Videos"));
+#line 203 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_free0 (title);
+#line 203 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ title = _tmp29_;
+#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp30_ = g_strdup (_ ("Publish photos and videos _to"));
+#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (label);
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- label = _tmp37_;
-#line 1646 "PublishingUI.c"
+#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ label = _tmp30_;
+#line 1788 "PublishingUI.c"
}
}
-#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp38_ = title;
-#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp38_);
#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp39_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
+ _tmp31_ = title;
#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp31_);
+#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp32_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
+#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->service_selector_box_model);
-#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->service_selector_box_model = _tmp39_;
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp40_ = self->priv->service_selector_box_model;
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp41_ = (GtkComboBox*) gtk_combo_box_new_with_model (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp41_);
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (self->priv->service_selector_box);
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->service_selector_box = _tmp41_;
+#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ self->priv->service_selector_box_model = _tmp32_;
#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp42_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
+ _tmp33_ = self->priv->service_selector_box_model;
#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp42_);
+ _tmp34_ = (GtkComboBox*) gtk_combo_box_new_with_model (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tree_model_get_type (), GtkTreeModel));
#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- renderer_pix = _tmp42_;
-#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp43_ = self->priv->service_selector_box;
-#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp44_ = renderer_pix;
-#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
+ g_object_ref_sink (_tmp34_);
+#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (self->priv->service_selector_box);
+#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ self->priv->service_selector_box = _tmp34_;
#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp45_ = self->priv->service_selector_box;
+ _tmp35_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp46_ = renderer_pix;
+ g_object_ref_sink (_tmp35_);
#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
+ renderer_pix = _tmp35_;
+#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp36_ = self->priv->service_selector_box;
+#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp37_ = renderer_pix;
+#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp47_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+ _tmp38_ = self->priv->service_selector_box;
#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp47_);
+ _tmp39_ = renderer_pix;
#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- renderer_text = _tmp47_;
-#line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp48_ = self->priv->service_selector_box;
-#line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp49_ = renderer_text;
-#line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
+ gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp50_ = self->priv->service_selector_box;
+ _tmp40_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp51_ = renderer_text;
+ g_object_ref_sink (_tmp40_);
#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
+ renderer_text = _tmp40_;
+#line 216 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp41_ = self->priv->service_selector_box;
+#line 216 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp42_ = renderer_text;
+#line 216 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
#line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp52_ = self->priv->service_selector_box;
+ _tmp43_ = self->priv->service_selector_box;
+#line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp44_ = renderer_text;
#line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_combo_box_set_active (_tmp52_, 0);
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp53_ = config_facade_get_instance ();
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp54_ = _tmp53_;
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp55_ = configuration_facade_get_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp56_ = _tmp55_;
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (_tmp54_);
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- last_used_service = _tmp56_;
+ gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
+#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp45_ = self->priv->service_selector_box;
+#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_combo_box_set_active (_tmp45_, 0);
#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp57_ = has_photos;
+ _tmp46_ = config_facade_get_instance ();
#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp58_ = has_videos;
+ _tmp47_ = _tmp46_;
#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp60_ = publishing_ui_publishing_dialog_load_services (_tmp57_, _tmp58_, &_tmp59_);
+ _tmp48_ = configuration_facade_get_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- loaded_services = _tmp60_;
+ _tmp49_ = _tmp48_;
#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- loaded_services_length1 = _tmp59_;
+ _g_object_unref0 (_tmp47_);
#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ last_used_service = _tmp49_;
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp50_ = has_photos;
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp51_ = has_videos;
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp53_ = publishing_ui_publishing_dialog_load_services (_tmp50_, _tmp51_, &_tmp52_);
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ loaded_services = _tmp53_;
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ loaded_services_length1 = _tmp52_;
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_loaded_services_size_ = loaded_services_length1;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp61_ = loaded_services;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp61__length1 = loaded_services_length1;
-#line 1737 "PublishingUI.c"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp54_ = loaded_services;
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp54__length1 = loaded_services_length1;
+#line 1879 "PublishingUI.c"
{
SpitPublishingService** service_collection = NULL;
gint service_collection_length1 = 0;
gint _service_collection_size_ = 0;
gint service_it = 0;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_collection = _tmp61_;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_collection_length1 = _tmp61__length1;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- for (service_it = 0; service_it < _tmp61__length1; service_it = service_it + 1) {
-#line 1749 "PublishingUI.c"
- SpitPublishingService* _tmp62_;
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ service_collection = _tmp54_;
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ service_collection_length1 = _tmp54__length1;
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ for (service_it = 0; service_it < _tmp54__length1; service_it = service_it + 1) {
+#line 1891 "PublishingUI.c"
+ SpitPublishingService* _tmp55_;
SpitPublishingService* service = NULL;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp62_ = _g_object_ref0 (service_collection[service_it]);
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service = _tmp62_;
-#line 1756 "PublishingUI.c"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp55_ = _g_object_ref0 (service_collection[service_it]);
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ service = _tmp55_;
+#line 1898 "PublishingUI.c"
{
- GtkListStore* _tmp63_;
- GtkTreeIter _tmp64_ = {0};
+ GtkListStore* _tmp56_;
+ GtkTreeIter _tmp57_ = {0};
gchar* curr_service_id = NULL;
- SpitPublishingService* _tmp65_;
- const gchar* _tmp66_;
- gchar* _tmp67_;
- SpitPublishingService* _tmp68_;
- gboolean _tmp69_ = FALSE;
- SpitPluggableInfo _tmp70_;
- GdkPixbuf** _tmp71_;
- gint _tmp71__length1;
- const gchar* _tmp89_;
-#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp63_ = self->priv->service_selector_box_model;
-#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_list_store_append (_tmp63_, &_tmp64_);
-#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- iter = _tmp64_;
+ SpitPublishingService* _tmp58_;
+ const gchar* _tmp59_;
+ gchar* _tmp60_;
+ SpitPublishingService* _tmp61_;
+ gboolean _tmp62_ = FALSE;
+ SpitPluggableInfo _tmp63_;
+ GdkPixbuf** _tmp64_;
+ gint _tmp64__length1;
+ const gchar* _tmp82_;
#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp65_ = service;
+ _tmp56_ = self->priv->service_selector_box_model;
#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp66_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ gtk_list_store_append (_tmp56_, &_tmp57_);
#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp67_ = g_strdup (_tmp66_);
-#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- curr_service_id = _tmp67_;
+ iter = _tmp57_;
#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp68_ = service;
+ _tmp58_ = service;
#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- spit_pluggable_get_info (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, SPIT_TYPE_PLUGGABLE, SpitPluggable), &self->priv->info);
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp70_ = self->priv->info;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp71_ = _tmp70_.icons;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp71__length1 = _tmp70_.icons_length1;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (NULL != _tmp71_) {
-#line 1796 "PublishingUI.c"
- SpitPluggableInfo _tmp72_;
- GdkPixbuf** _tmp73_;
- gint _tmp73__length1;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp72_ = self->priv->info;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp73_ = _tmp72_.icons;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp73__length1 = _tmp72_.icons_length1;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp69_ = 0 < _tmp73__length1;
-#line 1808 "PublishingUI.c"
- } else {
+ _tmp59_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp60_ = g_strdup (_tmp59_);
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ curr_service_id = _tmp60_;
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp69_ = FALSE;
-#line 1812 "PublishingUI.c"
- }
+ _tmp61_ = service;
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp69_) {
-#line 1816 "PublishingUI.c"
- GtkListStore* _tmp74_;
- GtkTreeIter _tmp75_;
- SpitPluggableInfo _tmp76_;
- GdkPixbuf** _tmp77_;
- gint _tmp77__length1;
- GdkPixbuf* _tmp78_;
- SpitPublishingService* _tmp79_;
- const gchar* _tmp80_;
- GdkPixbuf* _tmp81_;
- GdkPixbuf* _tmp82_;
+ spit_pluggable_get_info (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, SPIT_TYPE_PLUGGABLE, SpitPluggable), &self->priv->info);
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp63_ = self->priv->info;
#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp74_ = self->priv->service_selector_box_model;
+ _tmp64_ = _tmp63_.icons;
#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp75_ = iter;
+ _tmp64__length1 = _tmp63_.icons_length1;
#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp76_ = self->priv->info;
+ if (NULL != _tmp64_) {
+#line 1938 "PublishingUI.c"
+ SpitPluggableInfo _tmp65_;
+ GdkPixbuf** _tmp66_;
+ gint _tmp66__length1;
#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp77_ = _tmp76_.icons;
+ _tmp65_ = self->priv->info;
#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp77__length1 = _tmp76_.icons_length1;
+ _tmp66_ = _tmp65_.icons;
#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp78_ = _tmp77_[0];
+ _tmp66__length1 = _tmp65_.icons_length1;
#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp79_ = service;
+ _tmp62_ = 0 < _tmp66__length1;
+#line 1950 "PublishingUI.c"
+ } else {
#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp80_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _tmp62_ = FALSE;
+#line 1954 "PublishingUI.c"
+ }
#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_list_store_set (_tmp74_, &_tmp75_, 0, _tmp78_, 1, _tmp80_, -1);
-#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp81_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
-#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (_tmp62_) {
+#line 1958 "PublishingUI.c"
+ GtkListStore* _tmp67_;
+ GtkTreeIter _tmp68_;
+ SpitPluggableInfo _tmp69_;
+ GdkPixbuf** _tmp70_;
+ gint _tmp70__length1;
+ GdkPixbuf* _tmp71_;
+ SpitPublishingService* _tmp72_;
+ const gchar* _tmp73_;
+ GdkPixbuf* _tmp74_;
+ GdkPixbuf* _tmp75_;
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp67_ = self->priv->service_selector_box_model;
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp68_ = iter;
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp69_ = self->priv->info;
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp70_ = _tmp69_.icons;
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp70__length1 = _tmp69_.icons_length1;
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp71_ = _tmp70_[0];
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp72_ = service;
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp73_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_list_store_set (_tmp67_, &_tmp68_, 0, _tmp71_, 1, _tmp73_, -1);
+#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp74_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
+#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->info.icons[0]);
-#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->info.icons[0] = _tmp81_;
-#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp82_ = self->priv->info.icons[0];
-#line 1853 "PublishingUI.c"
+#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ self->priv->info.icons[0] = _tmp74_;
+#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp75_ = self->priv->info.icons[0];
+#line 1995 "PublishingUI.c"
} else {
- GtkListStore* _tmp83_;
- GtkTreeIter _tmp84_;
- GdkPixbuf* _tmp85_;
- GdkPixbuf* _tmp86_;
- SpitPublishingService* _tmp87_;
- const gchar* _tmp88_;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp83_ = self->priv->service_selector_box_model;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp84_ = iter;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp85_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp86_ = _tmp85_;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp87_ = service;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp88_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_list_store_set (_tmp83_, &_tmp84_, 0, _tmp86_, 1, _tmp88_, -1);
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (_tmp86_);
-#line 1877 "PublishingUI.c"
+ GtkListStore* _tmp76_;
+ GtkTreeIter _tmp77_;
+ GdkPixbuf* _tmp78_;
+ GdkPixbuf* _tmp79_;
+ SpitPublishingService* _tmp80_;
+ const gchar* _tmp81_;
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp76_ = self->priv->service_selector_box_model;
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp77_ = iter;
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp78_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp79_ = _tmp78_;
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp80_ = service;
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp81_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_list_store_set (_tmp76_, &_tmp77_, 0, _tmp79_, 1, _tmp81_, -1);
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (_tmp79_);
+#line 2019 "PublishingUI.c"
}
-#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp89_ = last_used_service;
-#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp89_ == NULL) {
-#line 1883 "PublishingUI.c"
- GtkComboBox* _tmp90_;
- GtkTreeIter _tmp91_;
- SpitPublishingService* _tmp92_;
- const gchar* _tmp93_;
- gchar* _tmp94_;
-#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp90_ = self->priv->service_selector_box;
-#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp91_ = iter;
-#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_combo_box_set_active_iter (_tmp90_, &_tmp91_);
-#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp92_ = service;
-#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp93_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp94_ = g_strdup (_tmp93_);
-#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_free0 (last_used_service);
+ _tmp82_ = last_used_service;
#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- last_used_service = _tmp94_;
-#line 1905 "PublishingUI.c"
- } else {
- const gchar* _tmp95_;
- const gchar* _tmp96_;
+ if (_tmp82_ == NULL) {
+#line 2025 "PublishingUI.c"
+ GtkComboBox* _tmp83_;
+ GtkTreeIter _tmp84_;
+ SpitPublishingService* _tmp85_;
+ const gchar* _tmp86_;
+ gchar* _tmp87_;
#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp95_ = last_used_service;
+ _tmp83_ = self->priv->service_selector_box;
#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp96_ = curr_service_id;
+ _tmp84_ = iter;
#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (g_strcmp0 (_tmp95_, _tmp96_) == 0) {
-#line 1915 "PublishingUI.c"
- GtkComboBox* _tmp97_;
- GtkTreeIter _tmp98_;
+ gtk_combo_box_set_active_iter (_tmp83_, &_tmp84_);
#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp97_ = self->priv->service_selector_box;
+ _tmp85_ = service;
#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp98_ = iter;
+ _tmp86_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_combo_box_set_active_iter (_tmp97_, &_tmp98_);
-#line 1924 "PublishingUI.c"
+ _tmp87_ = g_strdup (_tmp86_);
+#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_free0 (last_used_service);
+#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ last_used_service = _tmp87_;
+#line 2047 "PublishingUI.c"
+ } else {
+ const gchar* _tmp88_;
+ const gchar* _tmp89_;
+#line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp88_ = last_used_service;
+#line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp89_ = curr_service_id;
+#line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (g_strcmp0 (_tmp88_, _tmp89_) == 0) {
+#line 2057 "PublishingUI.c"
+ GtkComboBox* _tmp90_;
+ GtkTreeIter _tmp91_;
+#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp90_ = self->priv->service_selector_box;
+#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp91_ = iter;
+#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_combo_box_set_active_iter (_tmp90_, &_tmp91_);
+#line 2066 "PublishingUI.c"
}
}
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (curr_service_id);
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service);
-#line 1931 "PublishingUI.c"
+#line 2073 "PublishingUI.c"
}
}
}
-#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp99_ = self->priv->service_selector_box;
-#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_signal_connect_object (_tmp99_, "changed", (GCallback) _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp100_ = use_header;
+ _tmp92_ = self->priv->service_selector_box;
#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (!_tmp100_) {
-#line 1943 "PublishingUI.c"
+ g_signal_connect_object (_tmp92_, "changed", (GCallback) _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp93_ = use_header;
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (!_tmp93_) {
+#line 2085 "PublishingUI.c"
GtkLabel* service_selector_box_label = NULL;
- const gchar* _tmp101_;
- GtkLabel* _tmp102_;
- GtkLabel* _tmp103_;
- GtkComboBox* _tmp104_;
- GtkLabel* _tmp105_;
- GtkLabel* _tmp106_;
- GtkComboBox* _tmp107_;
- GtkComboBox* _tmp108_;
- GtkComboBox* _tmp109_;
- GtkComboBox* _tmp110_;
+ const gchar* _tmp94_;
+ GtkLabel* _tmp95_;
+ GtkLabel* _tmp96_;
+ GtkComboBox* _tmp97_;
+ GtkLabel* _tmp98_;
+ GtkLabel* _tmp99_;
+ GtkComboBox* _tmp100_;
+ GtkComboBox* _tmp101_;
+ GtkComboBox* _tmp102_;
+ GtkComboBox* _tmp103_;
GtkBox* service_selector_layouter = NULL;
+ GtkBox* _tmp104_;
+ GtkBox* _tmp105_;
+ GtkBox* _tmp106_;
+ GtkBox* _tmp107_;
+ GtkLabel* _tmp108_;
+ GtkBox* _tmp109_;
+ GtkComboBox* _tmp110_;
+ GtkBox* service_area_layouter = NULL;
GtkBox* _tmp111_;
GtkBox* _tmp112_;
GtkBox* _tmp113_;
GtkBox* _tmp114_;
- GtkLabel* _tmp115_;
- GtkBox* _tmp116_;
- GtkComboBox* _tmp117_;
- GtkBox* service_area_layouter = NULL;
+ GtkSeparator* _tmp115_;
+ GtkSeparator* _tmp116_;
+ GtkBox* _tmp117_;
GtkBox* _tmp118_;
GtkBox* _tmp119_;
GtkBox* _tmp120_;
GtkBox* _tmp121_;
- GtkSeparator* _tmp122_;
- GtkSeparator* _tmp123_;
- GtkBox* _tmp124_;
- GtkBox* _tmp125_;
- GtkBox* _tmp126_;
- GtkBox* _tmp127_;
- GtkBox* _tmp128_;
- GtkBox* _tmp129_;
-#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp101_ = label;
-#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp102_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp101_);
-#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp102_);
-#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_selector_box_label = _tmp102_;
-#line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp103_ = service_selector_box_label;
-#line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp104_ = self->priv->service_selector_box;
-#line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_label_set_mnemonic_widget (_tmp103_, G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, gtk_widget_get_type (), GtkWidget));
+ GtkBox* _tmp122_;
+#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp94_ = label;
#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp105_ = service_selector_box_label;
+ _tmp95_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp94_);
#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+ g_object_ref_sink (_tmp95_);
+#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ service_selector_box_label = _tmp95_;
+#line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp96_ = service_selector_box_label;
#line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp106_ = service_selector_box_label;
+ _tmp97_ = self->priv->service_selector_box;
#line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 267 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp107_ = self->priv->service_selector_box;
-#line 267 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
-#line 268 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp108_ = self->priv->service_selector_box;
-#line 268 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+ gtk_label_set_mnemonic_widget (_tmp96_, G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, gtk_widget_get_type (), GtkWidget));
+#line 262 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp98_ = service_selector_box_label;
+#line 262 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+#line 263 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp99_ = service_selector_box_label;
+#line 263 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp109_ = self->priv->service_selector_box;
+ _tmp100_ = self->priv->service_selector_box;
#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
#line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp110_ = self->priv->service_selector_box;
+ _tmp101_ = self->priv->service_selector_box;
#line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp102_ = self->priv->service_selector_box;
+#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp111_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-#line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp111_);
+ _tmp103_ = self->priv->service_selector_box;
#line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_selector_layouter = _tmp111_;
-#line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp112_ = service_selector_layouter;
-#line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_container_get_type (), GtkContainer), (guint) 12);
+ gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp113_ = service_selector_layouter;
+ _tmp104_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp113_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp114_ = service_selector_layouter;
+ g_object_ref_sink (_tmp104_);
+#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ service_selector_layouter = _tmp104_;
#line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp115_ = service_selector_box_label;
+ _tmp105_ = service_selector_layouter;
#line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, gtk_widget_get_type (), GtkWidget));
+ gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_container_get_type (), GtkContainer), (guint) 12);
#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp116_ = service_selector_layouter;
+ _tmp106_ = service_selector_layouter;
#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp117_ = self->priv->service_selector_box;
-#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_box_pack_start (_tmp116_, G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp118_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp118_);
-#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_area_layouter = _tmp118_;
-#line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp119_ = service_area_layouter;
-#line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp120_ = service_selector_layouter;
-#line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, gtk_widget_get_type (), GtkWidget));
-#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp121_ = service_area_layouter;
-#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp122_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp122_);
+ gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 277 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp107_ = service_selector_layouter;
+#line 277 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp108_ = service_selector_box_label;
+#line 277 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget));
+#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp109_ = service_selector_layouter;
+#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp110_ = self->priv->service_selector_box;
+#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_box_pack_start (_tmp109_, G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp123_ = _tmp122_;
+ _tmp111_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_widget_get_type (), GtkWidget));
+ g_object_ref_sink (_tmp111_);
#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (_tmp123_);
+ service_area_layouter = _tmp111_;
#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp124_ = service_area_layouter;
+ _tmp112_ = service_area_layouter;
#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+ _tmp113_ = service_selector_layouter;
+#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp113_, gtk_widget_get_type (), GtkWidget));
+#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp114_ = service_area_layouter;
+#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp115_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_object_ref_sink (_tmp115_);
#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp125_ = service_area_layouter;
+ _tmp116_ = _tmp115_;
#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, gtk_widget_get_type (), GtkWidget));
+#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (_tmp116_);
#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp126_ = service_area_layouter;
+ _tmp117_ = service_area_layouter;
#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, gtk_widget_get_type (), GtkWidget), TRUE);
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
#line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp127_ = service_area_layouter;
+ _tmp118_ = service_area_layouter;
#line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp128_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+ gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+#line 287 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp119_ = service_area_layouter;
+#line 287 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp129_ = service_area_layouter;
+ _tmp120_ = service_area_layouter;
#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_box_pack_start (_tmp128_, G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 290 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp121_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 290 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp122_ = service_area_layouter;
+#line 290 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_box_pack_start (_tmp121_, G_TYPE_CHECK_INSTANCE_CAST (_tmp122_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service_area_layouter);
-#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service_selector_layouter);
-#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service_selector_box_label);
-#line 2092 "PublishingUI.c"
+#line 2234 "PublishingUI.c"
}
-#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp130_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp130_);
-#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (self->priv->central_area_layouter);
-#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->central_area_layouter = _tmp130_;
#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp131_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+ _tmp123_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp132_ = self->priv->central_area_layouter;
+ g_object_ref_sink (_tmp123_);
#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_box_pack_start (_tmp131_, G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+ _g_object_unref0 (self->priv->central_area_layouter);
+#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ self->priv->central_area_layouter = _tmp123_;
#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp133_ = use_header;
+ _tmp124_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp133_) {
-#line 2112 "PublishingUI.c"
- GtkButton* _tmp134_;
- GtkButton* _tmp135_;
- GtkWidget* _tmp136_;
- GtkButton* _tmp137_;
- GtkWidget* _tmp138_;
- GtkComboBox* _tmp139_;
-#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp134_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
-#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp134_);
-#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (self->priv->close_cancel_button);
-#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->close_cancel_button = _tmp134_;
+ _tmp125_ = self->priv->central_area_layouter;
+#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_box_pack_start (_tmp124_, G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp135_ = self->priv->close_cancel_button;
+ _tmp126_ = use_header;
#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp136_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+ if (_tmp126_) {
+#line 2254 "PublishingUI.c"
+ GtkButton* _tmp127_;
+ GtkButton* _tmp128_;
+ GtkWidget* _tmp129_;
+ GtkButton* _tmp130_;
+ GtkWidget* _tmp131_;
+ GtkComboBox* _tmp132_;
+#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp127_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
+#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_object_ref_sink (_tmp127_);
+#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (self->priv->close_cancel_button);
+#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ self->priv->close_cancel_button = _tmp127_;
#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp137_ = self->priv->close_cancel_button;
+ _tmp128_ = self->priv->close_cancel_button;
#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp136_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, gtk_widget_get_type (), GtkWidget));
-#line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp138_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp139_ = self->priv->service_selector_box;
-#line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, gtk_widget_get_type (), GtkWidget));
-#line 2143 "PublishingUI.c"
+ gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp128_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp129_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp130_ = self->priv->close_cancel_button;
+#line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, gtk_widget_get_type (), GtkWidget));
+#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp131_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp132_ = self->priv->service_selector_box;
+#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp131_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget));
+#line 2285 "PublishingUI.c"
} else {
- GtkWidget* _tmp140_;
- GtkButton* _tmp141_;
-#line 303 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ GtkWidget* _tmp133_;
+ GtkButton* _tmp134_;
+#line 305 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _ ("_Cancel"), (gint) GTK_RESPONSE_CANCEL);
-#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp140_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
-#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp141_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp140_, gtk_button_get_type ()) ? ((GtkButton*) _tmp140_) : NULL);
-#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (self->priv->close_cancel_button);
-#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->close_cancel_button = _tmp141_;
-#line 2157 "PublishingUI.c"
- }
#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp142_ = self->priv->close_cancel_button;
+ _tmp133_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
+#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp134_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp133_, gtk_button_get_type ()) ? ((GtkButton*) _tmp133_) : NULL);
+#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (self->priv->close_cancel_button);
#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_signal_connect_object (_tmp142_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
+ self->priv->close_cancel_button = _tmp134_;
+#line 2299 "PublishingUI.c"
+ }
#line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- publishing_ui_publishing_dialog_set_standard_window_mode (self);
+ _tmp135_ = self->priv->close_cancel_button;
+#line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_signal_connect_object (_tmp135_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
#line 310 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ publishing_ui_publishing_dialog_set_standard_window_mode (self);
+#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
loaded_services = (_vala_array_free (loaded_services, loaded_services_length1, (GDestroyNotify) g_object_unref), NULL);
@@ -2177,69 +2319,75 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
_g_free0 (title);
#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 2181 "PublishingUI.c"
+#line 2323 "PublishingUI.c"
}
-PublishingUIPublishingDialog* publishing_ui_publishing_dialog_new (GeeCollection* to_publish) {
+PublishingUIPublishingDialog*
+publishing_ui_publishing_dialog_new (GeeCollection* to_publish)
+{
#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_publishing_dialog_construct (PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, to_publish);
-#line 2188 "PublishingUI.c"
+#line 2332 "PublishingUI.c"
}
-static void _vala_array_add56 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void
+_vala_array_add59 (SpitPublishingService** * array,
+ int* length,
+ int* size,
+ SpitPublishingService* value)
+{
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((*length) == (*size)) {
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2199 "PublishingUI.c"
+#line 2348 "PublishingUI.c"
}
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[(*length)++] = value;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[*length] = NULL;
-#line 2205 "PublishingUI.c"
+#line 2354 "PublishingUI.c"
}
-static gint __lambda15_ (void* a, void* b) {
+static gint
+__lambda16_ (void* a,
+ void* b)
+{
gint result = 0;
- void* _tmp0_;
+ const gchar* _tmp0_;
const gchar* _tmp1_;
- void* _tmp2_;
- const gchar* _tmp3_;
- gint _tmp4_;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp0_ = a;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp1_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) _tmp0_), SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp2_ = b;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) _tmp2_), SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp4_ = utf8_cs_compare (_tmp1_, _tmp3_);
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- result = _tmp4_;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp0_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) a), SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp1_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) b), SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ result = utf8_cs_compare (_tmp0_, _tmp1_);
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 2230 "PublishingUI.c"
+#line 2373 "PublishingUI.c"
}
-static gint ___lambda15____compar_fn_t (void* key1, void* key2) {
+static gint
+___lambda16____compar_fn_t (void* key1,
+ void* key2)
+{
gint result;
- result = __lambda15_ (key1, key2);
-#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ result = __lambda16_ (key1, key2);
+#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 2239 "PublishingUI.c"
+#line 2385 "PublishingUI.c"
}
-static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services (int* result_length1) {
+static SpitPublishingService**
+publishing_ui_publishing_dialog_load_all_services (int* result_length1)
+{
SpitPublishingService** result = NULL;
SpitPublishingService** loaded_services = NULL;
SpitPublishingService** _tmp0_;
@@ -2250,696 +2398,678 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
GeeCollection* _tmp2_;
gint _tmp3_;
gint _tmp4_;
+ SpitPublishingService** _tmp23_;
+ gint _tmp23__length1;
+ SpitPublishingService** _tmp24_;
+ gint _tmp24__length1;
SpitPublishingService** _tmp25_;
gint _tmp25__length1;
- SpitPublishingService** _tmp26_;
- gint _tmp26__length1;
- SpitPublishingService** _tmp27_;
- gint _tmp27__length1;
-#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 316 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = g_new0 (SpitPublishingService*, 0 + 1);
-#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 316 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
loaded_services = _tmp0_;
-#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 316 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
loaded_services_length1 = 0;
-#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 316 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_loaded_services_size_ = loaded_services_length1;
-#line 317 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 319 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = plugins_get_pluggables_for_type (SPIT_PUBLISHING_TYPE_SERVICE, NULL, NULL, NULL, FALSE);
-#line 317 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 319 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
pluggables = _tmp1_;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = pluggables;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp3_ = gee_collection_get_size (_tmp2_);
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = _tmp3_;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_debug ("PublishingUI.vala:320: PublisingDialog: discovered %d pluggable publis" \
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_debug ("PublishingUI.vala:322: PublisingDialog: discovered %d pluggable publis" \
"hing services.", _tmp4_);
-#line 2280 "PublishingUI.c"
+#line 2428 "PublishingUI.c"
{
GeeIterator* _pluggable_it = NULL;
GeeCollection* _tmp5_;
GeeIterator* _tmp6_;
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp5_ = pluggables;
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_pluggable_it = _tmp6_;
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
while (TRUE) {
-#line 2293 "PublishingUI.c"
+#line 2441 "PublishingUI.c"
GeeIterator* _tmp7_;
- gboolean _tmp8_;
SpitPluggable* pluggable = NULL;
- GeeIterator* _tmp9_;
- gpointer _tmp10_;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
gint pluggable_interface = 0;
- SpitPluggable* _tmp11_;
- gint _tmp12_;
- gint _tmp13_;
+ SpitPluggable* _tmp10_;
+ gint _tmp11_;
SpitPublishingService* service = NULL;
- SpitPluggable* _tmp18_;
- SpitPublishingService* _tmp19_;
- SpitPublishingService* _tmp20_;
- const gchar* _tmp21_;
- SpitPublishingService** _tmp22_;
- gint _tmp22__length1;
- SpitPublishingService* _tmp23_;
- SpitPublishingService* _tmp24_;
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ SpitPluggable* _tmp16_;
+ SpitPublishingService* _tmp17_;
+ SpitPublishingService* _tmp18_;
+ const gchar* _tmp19_;
+ SpitPublishingService** _tmp20_;
+ gint _tmp20__length1;
+ SpitPublishingService* _tmp21_;
+ SpitPublishingService* _tmp22_;
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp7_ = _pluggable_it;
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp8_ = gee_iterator_next (_tmp7_);
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (!_tmp8_) {
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (!gee_iterator_next (_tmp7_)) {
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
break;
-#line 2320 "PublishingUI.c"
+#line 2464 "PublishingUI.c"
}
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp9_ = _pluggable_it;
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp10_ = gee_iterator_get (_tmp9_);
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- pluggable = (SpitPluggable*) _tmp10_;
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp11_ = pluggable;
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp12_ = spit_pluggable_get_pluggable_interface (_tmp11_, SPIT_PUBLISHING_CURRENT_INTERFACE, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- pluggable_interface = _tmp12_;
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp8_ = _pluggable_it;
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp9_ = gee_iterator_get (_tmp8_);
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ pluggable = (SpitPluggable*) _tmp9_;
#line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp13_ = pluggable_interface;
+ _tmp10_ = pluggable;
#line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp13_ != SPIT_PUBLISHING_CURRENT_INTERFACE) {
-#line 2338 "PublishingUI.c"
- SpitPluggable* _tmp14_;
- gchar* _tmp15_;
- gchar* _tmp16_;
- gint _tmp17_;
-#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp14_ = pluggable;
-#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp15_ = plugins_get_pluggable_module_id (_tmp14_);
-#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp16_ = _tmp15_;
-#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp17_ = pluggable_interface;
-#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_warning ("PublishingUI.vala:326: Unable to load publisher %s: reported interface" \
-" %d.", _tmp16_, _tmp17_);
-#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_free0 (_tmp16_);
-#line 329 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ pluggable_interface = spit_pluggable_get_pluggable_interface (_tmp10_, SPIT_PUBLISHING_CURRENT_INTERFACE, SPIT_PUBLISHING_CURRENT_INTERFACE);
+#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp11_ = pluggable_interface;
+#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (_tmp11_ != SPIT_PUBLISHING_CURRENT_INTERFACE) {
+#line 2480 "PublishingUI.c"
+ SpitPluggable* _tmp12_;
+ gchar* _tmp13_;
+ gchar* _tmp14_;
+ gint _tmp15_;
+#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp12_ = pluggable;
+#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp13_ = plugins_get_pluggable_module_id (_tmp12_);
+#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp14_ = _tmp13_;
+#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp15_ = pluggable_interface;
+#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_warning ("PublishingUI.vala:328: Unable to load publisher %s: reported interface" \
+" %d.", _tmp14_, _tmp15_);
+#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_free0 (_tmp14_);
+#line 331 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (pluggable);
-#line 329 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 331 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
continue;
-#line 2359 "PublishingUI.c"
+#line 2501 "PublishingUI.c"
}
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp18_ = pluggable;
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService));
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service = _tmp19_;
-#line 335 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp20_ = service;
-#line 335 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp21_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 335 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_debug ("PublishingUI.vala:335: PublishingDialog: discovered pluggable publishi" \
-"ng service '%s'.", _tmp21_);
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp22_ = loaded_services;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp22__length1 = loaded_services_length1;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp23_ = service;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp24_ = _g_object_ref0 (_tmp23_);
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _vala_array_add56 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp24_);
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 334 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp16_ = pluggable;
+#line 334 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService));
+#line 334 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ service = _tmp17_;
+#line 337 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp18_ = service;
+#line 337 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp19_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 337 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_debug ("PublishingUI.vala:337: PublishingDialog: discovered pluggable publishi" \
+"ng service '%s'.", _tmp19_);
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp20_ = loaded_services;
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp20__length1 = loaded_services_length1;
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp21_ = service;
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp22_ = _g_object_ref0 (_tmp21_);
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _vala_array_add59 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp22_);
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service);
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (pluggable);
-#line 2387 "PublishingUI.c"
+#line 2529 "PublishingUI.c"
}
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (_pluggable_it);
-#line 2391 "PublishingUI.c"
+#line 2533 "PublishingUI.c"
}
-#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp23_ = loaded_services;
+#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp23__length1 = loaded_services_length1;
+#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp24_ = loaded_services;
+#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp24__length1 = loaded_services_length1;
+#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ qsort (_tmp23_, (gsize) _tmp24__length1, (gsize) sizeof (SpitPublishingService*), ___lambda16____compar_fn_t);
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp25_ = loaded_services;
-#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp25__length1 = loaded_services_length1;
-#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp26_ = loaded_services;
-#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp26__length1 = loaded_services_length1;
-#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- qsort (_tmp25_, (gsize) _tmp26__length1, (gsize) sizeof (SpitPublishingService*), ___lambda15____compar_fn_t);
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp27_ = loaded_services;
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp27__length1 = loaded_services_length1;
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (result_length1) {
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- *result_length1 = _tmp27__length1;
-#line 2411 "PublishingUI.c"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ *result_length1 = _tmp25__length1;
+#line 2553 "PublishingUI.c"
}
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- result = _tmp27_;
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ result = _tmp25_;
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (pluggables);
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 2419 "PublishingUI.c"
+#line 2561 "PublishingUI.c"
}
-static void _vala_array_add57 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void
+_vala_array_add60 (SpitPublishingService** * array,
+ int* length,
+ int* size,
+ SpitPublishingService* value)
+{
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((*length) == (*size)) {
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2430 "PublishingUI.c"
+#line 2577 "PublishingUI.c"
}
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[(*length)++] = value;
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[*length] = NULL;
-#line 2436 "PublishingUI.c"
+#line 2583 "PublishingUI.c"
}
-static void _vala_array_add58 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void
+_vala_array_add61 (SpitPublishingService** * array,
+ int* length,
+ int* size,
+ SpitPublishingService* value)
+{
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((*length) == (*size)) {
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2447 "PublishingUI.c"
+#line 2599 "PublishingUI.c"
}
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[(*length)++] = value;
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[*length] = NULL;
-#line 2453 "PublishingUI.c"
+#line 2605 "PublishingUI.c"
}
-static void _vala_array_add59 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void
+_vala_array_add62 (SpitPublishingService** * array,
+ int* length,
+ int* size,
+ SpitPublishingService* value)
+{
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((*length) == (*size)) {
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2464 "PublishingUI.c"
+#line 2621 "PublishingUI.c"
}
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[(*length)++] = value;
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[*length] = NULL;
-#line 2470 "PublishingUI.c"
+#line 2627 "PublishingUI.c"
}
-static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gboolean has_photos, gboolean has_videos, int* result_length1) {
+static SpitPublishingService**
+publishing_ui_publishing_dialog_load_services (gboolean has_photos,
+ gboolean has_videos,
+ int* result_length1)
+{
SpitPublishingService** result = NULL;
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_;
SpitPublishingService** filtered_services = NULL;
- SpitPublishingService** _tmp3_;
+ SpitPublishingService** _tmp1_;
gint filtered_services_length1;
gint _filtered_services_size_;
SpitPublishingService** all_services = NULL;
- gint _tmp4_;
- SpitPublishingService** _tmp5_;
+ gint _tmp2_;
+ SpitPublishingService** _tmp3_;
gint all_services_length1;
gint _all_services_size_;
- SpitPublishingService** _tmp6_;
- gint _tmp6__length1;
- SpitPublishingService** _tmp32_;
- gint _tmp32__length1;
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp1_ = has_photos;
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp1_) {
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ SpitPublishingService** _tmp4_;
+ gint _tmp4__length1;
+ SpitPublishingService** _tmp22_;
+ gint _tmp22__length1;
+#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (has_photos) {
+#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = TRUE;
-#line 2497 "PublishingUI.c"
+#line 2655 "PublishingUI.c"
} else {
- gboolean _tmp2_;
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp2_ = has_videos;
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp0_ = _tmp2_;
-#line 2504 "PublishingUI.c"
- }
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _vala_assert (_tmp0_, "has_photos || has_videos");
#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp3_ = g_new0 (SpitPublishingService*, 0 + 1);
-#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- filtered_services = _tmp3_;
+ _tmp0_ = has_videos;
+#line 2659 "PublishingUI.c"
+ }
#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _vala_assert (_tmp0_, "has_photos || has_videos");
+#line 355 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp1_ = g_new0 (SpitPublishingService*, 0 + 1);
+#line 355 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ filtered_services = _tmp1_;
+#line 355 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
filtered_services_length1 = 0;
-#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 355 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_filtered_services_size_ = filtered_services_length1;
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp5_ = publishing_ui_publishing_dialog_load_all_services (&_tmp4_);
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- all_services = _tmp5_;
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- all_services_length1 = _tmp4_;
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _all_services_size_ = all_services_length1;
#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp6_ = all_services;
+ _tmp3_ = publishing_ui_publishing_dialog_load_all_services (&_tmp2_);
#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp6__length1 = all_services_length1;
-#line 2528 "PublishingUI.c"
+ all_services = _tmp3_;
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ all_services_length1 = _tmp2_;
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _all_services_size_ = all_services_length1;
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp4_ = all_services;
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp4__length1 = all_services_length1;
+#line 2683 "PublishingUI.c"
{
SpitPublishingService** service_collection = NULL;
gint service_collection_length1 = 0;
gint _service_collection_size_ = 0;
gint service_it = 0;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_collection = _tmp6_;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_collection_length1 = _tmp6__length1;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- for (service_it = 0; service_it < _tmp6__length1; service_it = service_it + 1) {
-#line 2540 "PublishingUI.c"
- SpitPublishingService* _tmp7_;
- SpitPublishingService* service = NULL;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp7_ = _g_object_ref0 (service_collection[service_it]);
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service = _tmp7_;
-#line 2547 "PublishingUI.c"
- {
- gboolean _tmp8_ = FALSE;
- gboolean _tmp9_;
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp9_ = has_photos;
#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp9_) {
-#line 2555 "PublishingUI.c"
- gboolean _tmp10_;
+ service_collection = _tmp4_;
#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp10_ = has_videos;
+ service_collection_length1 = _tmp4__length1;
#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp8_ = !_tmp10_;
-#line 2561 "PublishingUI.c"
- } else {
+ for (service_it = 0; service_it < _tmp4__length1; service_it = service_it + 1) {
+#line 2695 "PublishingUI.c"
+ SpitPublishingService* _tmp5_;
+ SpitPublishingService* service = NULL;
#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp8_ = FALSE;
-#line 2565 "PublishingUI.c"
- }
+ _tmp5_ = _g_object_ref0 (service_collection[service_it]);
#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp8_) {
-#line 2569 "PublishingUI.c"
- SpitPublishingService* _tmp11_;
- SpitPublishingPublisherMediaType _tmp12_;
-#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp11_ = service;
-#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp12_ = spit_publishing_service_get_supported_media (_tmp11_);
-#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if ((_tmp12_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 2578 "PublishingUI.c"
- SpitPublishingService** _tmp13_;
- gint _tmp13__length1;
- SpitPublishingService* _tmp14_;
- SpitPublishingService* _tmp15_;
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp13_ = filtered_services;
+ service = _tmp5_;
+#line 2702 "PublishingUI.c"
+ {
+ gboolean _tmp6_ = FALSE;
#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp13__length1 = filtered_services_length1;
+ if (has_photos) {
#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp14_ = service;
+ _tmp6_ = !has_videos;
+#line 2709 "PublishingUI.c"
+ } else {
#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp15_ = _g_object_ref0 (_tmp14_);
+ _tmp6_ = FALSE;
+#line 2713 "PublishingUI.c"
+ }
#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _vala_array_add57 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp15_);
-#line 2593 "PublishingUI.c"
- }
- } else {
- gboolean _tmp16_ = FALSE;
- gboolean _tmp17_;
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp17_ = has_photos;
+ if (_tmp6_) {
+#line 2717 "PublishingUI.c"
+ SpitPublishingService* _tmp7_;
#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (!_tmp17_) {
-#line 2602 "PublishingUI.c"
- gboolean _tmp18_;
+ _tmp7_ = service;
#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp18_ = has_videos;
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp16_ = _tmp18_;
-#line 2608 "PublishingUI.c"
- } else {
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp16_ = FALSE;
-#line 2612 "PublishingUI.c"
- }
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp16_) {
-#line 2616 "PublishingUI.c"
- SpitPublishingService* _tmp19_;
- SpitPublishingPublisherMediaType _tmp20_;
+ if ((spit_publishing_service_get_supported_media (_tmp7_) & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
+#line 2723 "PublishingUI.c"
+ SpitPublishingService** _tmp8_;
+ gint _tmp8__length1;
+ SpitPublishingService* _tmp9_;
+ SpitPublishingService* _tmp10_;
#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp19_ = service;
+ _tmp8_ = filtered_services;
#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp20_ = spit_publishing_service_get_supported_media (_tmp19_);
+ _tmp8__length1 = filtered_services_length1;
#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if ((_tmp20_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0) {
-#line 2625 "PublishingUI.c"
- SpitPublishingService** _tmp21_;
- gint _tmp21__length1;
- SpitPublishingService* _tmp22_;
- SpitPublishingService* _tmp23_;
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp21_ = filtered_services;
+ _tmp9_ = service;
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp10_ = _g_object_ref0 (_tmp9_);
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _vala_array_add60 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp10_);
+#line 2738 "PublishingUI.c"
+ }
+ } else {
+ gboolean _tmp11_ = FALSE;
#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp21__length1 = filtered_services_length1;
+ if (!has_photos) {
#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp22_ = service;
+ _tmp11_ = has_videos;
+#line 2746 "PublishingUI.c"
+ } else {
#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp23_ = _g_object_ref0 (_tmp22_);
+ _tmp11_ = FALSE;
+#line 2750 "PublishingUI.c"
+ }
#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _vala_array_add58 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp23_);
-#line 2640 "PublishingUI.c"
- }
- } else {
- gboolean _tmp24_ = FALSE;
- SpitPublishingService* _tmp25_;
- SpitPublishingPublisherMediaType _tmp26_;
+ if (_tmp11_) {
+#line 2754 "PublishingUI.c"
+ SpitPublishingService* _tmp12_;
+#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp12_ = service;
+#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if ((spit_publishing_service_get_supported_media (_tmp12_) & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0) {
+#line 2760 "PublishingUI.c"
+ SpitPublishingService** _tmp13_;
+ gint _tmp13__length1;
+ SpitPublishingService* _tmp14_;
+ SpitPublishingService* _tmp15_;
#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp25_ = service;
+ _tmp13_ = filtered_services;
#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp26_ = spit_publishing_service_get_supported_media (_tmp25_);
+ _tmp13__length1 = filtered_services_length1;
#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if ((_tmp26_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 2652 "PublishingUI.c"
- SpitPublishingService* _tmp27_;
- SpitPublishingPublisherMediaType _tmp28_;
-#line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp27_ = service;
-#line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp28_ = spit_publishing_service_get_supported_media (_tmp27_);
-#line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp24_ = (_tmp28_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0;
-#line 2661 "PublishingUI.c"
- } else {
+ _tmp14_ = service;
#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp24_ = FALSE;
-#line 2665 "PublishingUI.c"
- }
+ _tmp15_ = _g_object_ref0 (_tmp14_);
#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp24_) {
-#line 2669 "PublishingUI.c"
- SpitPublishingService** _tmp29_;
- gint _tmp29__length1;
- SpitPublishingService* _tmp30_;
- SpitPublishingService* _tmp31_;
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp29_ = filtered_services;
+ _vala_array_add61 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp15_);
+#line 2775 "PublishingUI.c"
+ }
+ } else {
+ gboolean _tmp16_ = FALSE;
+ SpitPublishingService* _tmp17_;
#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp29__length1 = filtered_services_length1;
+ _tmp17_ = service;
#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp30_ = service;
+ if ((spit_publishing_service_get_supported_media (_tmp17_) & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
+#line 2784 "PublishingUI.c"
+ SpitPublishingService* _tmp18_;
+#line 368 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp18_ = service;
+#line 368 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp16_ = (spit_publishing_service_get_supported_media (_tmp18_) & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0;
+#line 2790 "PublishingUI.c"
+ } else {
#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp31_ = _g_object_ref0 (_tmp30_);
+ _tmp16_ = FALSE;
+#line 2794 "PublishingUI.c"
+ }
#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _vala_array_add59 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp31_);
-#line 2684 "PublishingUI.c"
+ if (_tmp16_) {
+#line 2798 "PublishingUI.c"
+ SpitPublishingService** _tmp19_;
+ gint _tmp19__length1;
+ SpitPublishingService* _tmp20_;
+ SpitPublishingService* _tmp21_;
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp19_ = filtered_services;
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp19__length1 = filtered_services_length1;
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp20_ = service;
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp21_ = _g_object_ref0 (_tmp20_);
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _vala_array_add62 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp21_);
+#line 2813 "PublishingUI.c"
}
}
}
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service);
-#line 2690 "PublishingUI.c"
+#line 2819 "PublishingUI.c"
}
}
}
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp32_ = filtered_services;
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp32__length1 = filtered_services_length1;
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp22_ = filtered_services;
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp22__length1 = filtered_services_length1;
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (result_length1) {
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- *result_length1 = _tmp32__length1;
-#line 2702 "PublishingUI.c"
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ *result_length1 = _tmp22__length1;
+#line 2831 "PublishingUI.c"
}
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- result = _tmp32_;
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ result = _tmp22_;
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
all_services = (_vala_array_free (all_services, all_services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 2710 "PublishingUI.c"
+#line 2839 "PublishingUI.c"
}
-void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
+void
+publishing_ui_publishing_dialog_go (GeeCollection* to_publish)
+{
PublishingUIPublishingDialog* _tmp0_;
GTimer* _tmp1_;
GeeArrayList* photos = NULL;
GeeArrayList* _tmp10_;
GeeArrayList* videos = NULL;
GeeArrayList* _tmp11_;
- GeeCollection* _tmp12_;
+ GeeArrayList* _tmp12_;
GeeArrayList* _tmp13_;
- GeeArrayList* _tmp14_;
SpitPublishingService** avail_services = NULL;
- GeeArrayList* _tmp15_;
+ GeeArrayList* _tmp14_;
+ gint _tmp15_;
gint _tmp16_;
- gint _tmp17_;
- GeeArrayList* _tmp18_;
+ GeeArrayList* _tmp17_;
+ gint _tmp18_;
gint _tmp19_;
gint _tmp20_;
- gint _tmp21_;
- SpitPublishingService** _tmp22_;
+ SpitPublishingService** _tmp21_;
gint avail_services_length1;
gint _avail_services_size_;
- SpitPublishingService** _tmp23_;
- gint _tmp23__length1;
- GeeCollection* _tmp26_;
- PublishingUIPublishingDialog* _tmp27_;
- PublishingUIPublishingDialog* _tmp28_;
- GTimer* _tmp29_;
-#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ SpitPublishingService** _tmp22_;
+ gint _tmp22__length1;
+ PublishingUIPublishingDialog* _tmp25_;
+ PublishingUIPublishingDialog* _tmp26_;
+ GTimer* _tmp27_;
+#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (GEE_IS_COLLECTION (to_publish));
-#line 386 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 388 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = publishing_ui_publishing_dialog_active_instance;
-#line 386 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 388 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp0_ != NULL) {
-#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return;
-#line 2749 "PublishingUI.c"
+#line 2878 "PublishingUI.c"
}
-#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = publishing_ui_publishing_dialog_since_last_start;
-#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp1_ == NULL) {
-#line 2755 "PublishingUI.c"
+#line 2884 "PublishingUI.c"
GTimer* _tmp2_;
GTimer* _tmp3_;
GTimer* _tmp4_;
-#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = g_timer_new ();
-#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_timer_destroy0 (publishing_ui_publishing_dialog_since_last_start);
-#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_since_last_start = _tmp2_;
-#line 393 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp3_ = publishing_ui_publishing_dialog_since_last_start;
-#line 393 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_timer_stop (_tmp3_);
-#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = publishing_ui_publishing_dialog_since_last_start;
-#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_timer_reset (_tmp4_);
-#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_elapsed_is_valid = FALSE;
-#line 2775 "PublishingUI.c"
+#line 2904 "PublishingUI.c"
} else {
gdouble elapsed = 0.0;
GTimer* _tmp5_;
gdouble _tmp6_;
gboolean _tmp7_ = FALSE;
gdouble _tmp8_;
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 399 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp5_ = publishing_ui_publishing_dialog_since_last_start;
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 399 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp6_ = g_timer_elapsed (_tmp5_, NULL);
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 399 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
elapsed = _tmp6_;
-#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp8_ = elapsed;
-#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp8_ < 0.05) {
-#line 2792 "PublishingUI.c"
+#line 2921 "PublishingUI.c"
gboolean _tmp9_;
-#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp9_ = publishing_ui_publishing_dialog_elapsed_is_valid;
-#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp7_ = _tmp9_;
-#line 2798 "PublishingUI.c"
+#line 2927 "PublishingUI.c"
} else {
-#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp7_ = FALSE;
-#line 2802 "PublishingUI.c"
+#line 2931 "PublishingUI.c"
}
-#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp7_) {
-#line 399 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return;
-#line 2808 "PublishingUI.c"
+#line 2937 "PublishingUI.c"
}
}
-#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp10_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
photos = _tmp10_;
-#line 403 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 405 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp11_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 403 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 405 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
videos = _tmp11_;
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp12_ = to_publish;
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp13_ = photos;
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp14_ = videos;
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- media_source_collection_filter_media (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp15_ = photos;
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp17_ = _tmp16_;
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp18_ = videos;
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp20_ = _tmp19_;
#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp22_ = publishing_ui_publishing_dialog_load_services (_tmp17_ > 0, _tmp20_ > 0, &_tmp21_);
+ _tmp12_ = photos;
#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- avail_services = _tmp22_;
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- avail_services_length1 = _tmp21_;
+ _tmp13_ = videos;
#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ media_source_collection_filter_media (to_publish, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp14_ = photos;
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp15_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp16_ = _tmp15_;
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp17_ = videos;
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp18_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp19_ = _tmp18_;
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp21_ = publishing_ui_publishing_dialog_load_services (_tmp16_ > 0, _tmp19_ > 0, &_tmp20_);
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ avail_services = _tmp21_;
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ avail_services_length1 = _tmp20_;
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_avail_services_size_ = avail_services_length1;
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp23_ = avail_services;
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp23__length1 = avail_services_length1;
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp23__length1 == 0) {
-#line 2853 "PublishingUI.c"
+#line 411 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp22_ = avail_services;
+#line 411 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp22__length1 = avail_services_length1;
+#line 411 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (_tmp22__length1 == 0) {
+#line 2980 "PublishingUI.c"
+ gchar* _tmp23_;
gchar* _tmp24_;
- gchar* _tmp25_;
-#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp24_ = g_strdup_printf (_ ("Shotwell cannot publish the selected items because you do not have a c" \
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp23_ = g_strdup_printf (_ ("Shotwell cannot publish the selected items because you do not have a c" \
"ompatible publishing plugin enabled. To correct this, choose <b>Edit %" \
"s Preferences</b> and enable one or more of the publishing plugins on " \
"the <b>Plugins</b> tab."), "â–¸");
-#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp25_ = _tmp24_;
-#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- app_window_error_message_with_title (_ ("Unable to publish"), _tmp25_, NULL, FALSE);
-#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_free0 (_tmp25_);
-#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp24_ = _tmp23_;
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ app_window_error_message_with_title (_ ("Unable to publish"), _tmp24_, NULL, FALSE);
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_free0 (_tmp24_);
+#line 418 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
avail_services = (_vala_array_free (avail_services, avail_services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 418 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (videos);
-#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 418 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (photos);
-#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 418 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return;
-#line 2872 "PublishingUI.c"
+#line 2999 "PublishingUI.c"
}
-#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_debug ("PublishingUI.vala:422: PublishingDialog.go( )");
-#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp26_ = to_publish;
-#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp27_ = publishing_ui_publishing_dialog_new (_tmp26_);
-#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp27_);
#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (publishing_ui_publishing_dialog_active_instance);
-#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- publishing_ui_publishing_dialog_active_instance = _tmp27_;
+ g_debug ("PublishingUI.vala:424: PublishingDialog.go( )");
#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp28_ = publishing_ui_publishing_dialog_active_instance;
+ _tmp25_ = publishing_ui_publishing_dialog_new (to_publish);
+#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_object_ref_sink (_tmp25_);
#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- publishing_ui_publishing_dialog_run (_tmp28_);
-#line 428 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (publishing_ui_publishing_dialog_active_instance);
+#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ publishing_ui_publishing_dialog_active_instance = _tmp25_;
#line 428 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp26_ = publishing_ui_publishing_dialog_active_instance;
+#line 428 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ publishing_ui_publishing_dialog_run (_tmp26_);
+#line 430 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (publishing_ui_publishing_dialog_active_instance);
+#line 430 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_active_instance = NULL;
-#line 431 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp29_ = publishing_ui_publishing_dialog_since_last_start;
-#line 431 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_timer_start (_tmp29_);
-#line 432 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 433 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp27_ = publishing_ui_publishing_dialog_since_last_start;
+#line 433 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_timer_start (_tmp27_);
+#line 434 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_elapsed_is_valid = TRUE;
-#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
avail_services = (_vala_array_free (avail_services, avail_services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (videos);
-#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (photos);
-#line 2906 "PublishingUI.c"
+#line 3031 "PublishingUI.c"
}
-static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPublishingDialog* self, GdkEventAny* evt) {
+static gboolean
+publishing_ui_publishing_dialog_on_window_close (PublishingUIPublishingDialog* self,
+ GdkEventAny* evt)
+{
gboolean result = FALSE;
SpitPublishingConcretePublishingHost* _tmp0_;
-#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), FALSE);
-#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_val_if_fail (evt != NULL, FALSE);
-#line 436 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->host;
-#line 436 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
spit_publishing_plugin_host_stop_publishing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost));
-#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 439 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->host);
-#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 439 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->host = NULL;
-#line 438 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 440 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 439 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 441 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 443 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
result = TRUE;
-#line 441 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 443 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 2933 "PublishingUI.c"
+#line 3061 "PublishingUI.c"
}
-static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPublishingDialog* self) {
+static void
+publishing_ui_publishing_dialog_on_service_changed (PublishingUIPublishingDialog* self)
+{
GtkTreeIter iter = {0};
gboolean have_active_iter = FALSE;
GtkComboBox* _tmp0_;
@@ -2971,491 +3101,506 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
gint _tmp27__length1;
SpitPublishingConcretePublishingHost* _tmp28_;
SpitPublishingConcretePublishingHost* _tmp29_;
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
+#line 448 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
have_active_iter = FALSE;
-#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->service_selector_box;
-#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
iter = _tmp1_;
-#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
have_active_iter = _tmp2_;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp3_ = have_active_iter;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (!_tmp3_) {
-#line 2985 "PublishingUI.c"
+#line 3115 "PublishingUI.c"
GtkComboBox* _tmp4_;
GtkComboBox* _tmp5_;
GtkTreeIter _tmp6_ = {0};
-#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 454 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = self->priv->service_selector_box;
-#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 454 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_combo_box_set_active (_tmp4_, 0);
-#line 455 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp5_ = self->priv->service_selector_box;
-#line 455 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_combo_box_get_active_iter (_tmp5_, &_tmp6_);
-#line 455 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
iter = _tmp6_;
-#line 2999 "PublishingUI.c"
+#line 3129 "PublishingUI.c"
}
-#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp7_ = self->priv->service_selector_box_model;
-#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp8_ = iter;
-#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_tree_model_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp8_, 1, &_tmp9_);
-#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_tree_model_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp8_, 1, &_tmp9_);
+#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_IS_VALUE (&service_name_val) ? (g_value_unset (&service_name_val), NULL) : NULL;
-#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_name_val = _tmp9_;
#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ service_name_val = _tmp9_;
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp10_ = service_name_val;
-#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp11_ = g_strdup (g_value_get_string (&_tmp10_));
-#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_name = _tmp11_;
#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ service_name = _tmp11_;
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
selected_service = NULL;
-#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp13_ = publishing_ui_publishing_dialog_load_all_services (&_tmp12_);
-#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
services = _tmp13_;
-#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
services_length1 = _tmp12_;
-#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_services_size_ = services_length1;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp14_ = services;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp14__length1 = services_length1;
-#line 3031 "PublishingUI.c"
+#line 3161 "PublishingUI.c"
{
SpitPublishingService** service_collection = NULL;
gint service_collection_length1 = 0;
gint _service_collection_size_ = 0;
gint service_it = 0;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service_collection = _tmp14_;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service_collection_length1 = _tmp14__length1;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
for (service_it = 0; service_it < _tmp14__length1; service_it = service_it + 1) {
-#line 3043 "PublishingUI.c"
+#line 3173 "PublishingUI.c"
SpitPublishingService* _tmp15_;
SpitPublishingService* service = NULL;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp15_ = _g_object_ref0 (service_collection[service_it]);
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service = _tmp15_;
-#line 3050 "PublishingUI.c"
+#line 3180 "PublishingUI.c"
{
SpitPublishingService* _tmp16_;
const gchar* _tmp17_;
const gchar* _tmp18_;
-#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp16_ = service;
-#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp17_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp18_ = service_name;
-#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (g_strcmp0 (_tmp17_, _tmp18_) == 0) {
-#line 3063 "PublishingUI.c"
+#line 3193 "PublishingUI.c"
SpitPublishingService* _tmp19_;
SpitPublishingService* _tmp20_;
-#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp19_ = service;
-#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (selected_service);
-#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
selected_service = _tmp20_;
-#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 470 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service);
-#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 470 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
break;
-#line 3078 "PublishingUI.c"
+#line 3208 "PublishingUI.c"
}
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service);
-#line 3082 "PublishingUI.c"
+#line 3212 "PublishingUI.c"
}
}
}
-#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp21_ = selected_service;
-#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _vala_assert (_tmp21_ != NULL, "selected_service != null");
#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _vala_assert (_tmp21_ != NULL, "selected_service != null");
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp22_ = config_facade_get_instance ();
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp23_ = _tmp22_;
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp24_ = selected_service;
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp25_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
configuration_facade_set_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp25_);
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (_tmp23_);
#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (_tmp23_);
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp26_ = selected_service;
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp27_ = self->priv->publishables;
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp27__length1 = self->priv->publishables_length1;
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp28_ = spit_publishing_concrete_publishing_host_new (_tmp26_, self, _tmp27_, _tmp27__length1);
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->host);
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->host = _tmp28_;
-#line 476 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 478 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp29_ = self->priv->host;
-#line 476 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 478 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
spit_publishing_concrete_publishing_host_start_publishing (_tmp29_);
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
services = (_vala_array_free (services, services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (selected_service);
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (service_name);
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_IS_VALUE (&service_name_val) ? (g_value_unset (&service_name_val), NULL) : NULL;
-#line 3126 "PublishingUI.c"
+#line 3256 "PublishingUI.c"
}
-static void publishing_ui_publishing_dialog_on_close_cancel_clicked (PublishingUIPublishingDialog* self) {
+static void
+publishing_ui_publishing_dialog_on_close_cancel_clicked (PublishingUIPublishingDialog* self)
+{
SpitPublishingConcretePublishingHost* _tmp0_;
-#line 479 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 481 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 480 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_debug ("PublishingUI.vala:480: PublishingDialog: on_close_cancel_clicked( ): i" \
-"nvoked.");
#line 482 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_debug ("PublishingUI.vala:482: PublishingDialog: on_close_cancel_clicked( ): i" \
+"nvoked.");
+#line 484 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->host;
-#line 482 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 484 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
spit_publishing_plugin_host_stop_publishing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost));
-#line 483 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 485 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->host);
-#line 483 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 485 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->host = NULL;
-#line 484 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 486 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 485 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 487 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 3148 "PublishingUI.c"
+#line 3280 "PublishingUI.c"
}
-static void publishing_ui_publishing_dialog_set_large_window_mode (PublishingUIPublishingDialog* self) {
+static void
+publishing_ui_publishing_dialog_set_large_window_mode (PublishingUIPublishingDialog* self)
+{
GtkBox* _tmp0_;
-#line 488 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 490 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 489 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 491 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT);
-#line 490 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 492 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->central_area_layouter;
-#line 490 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
#line 492 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
+#line 494 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3164 "PublishingUI.c"
+#line 3298 "PublishingUI.c"
}
-static void publishing_ui_publishing_dialog_set_colossal_window_mode (PublishingUIPublishingDialog* self) {
+static void
+publishing_ui_publishing_dialog_set_colossal_window_mode (PublishingUIPublishingDialog* self)
+{
GtkBox* _tmp0_;
-#line 495 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 497 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 496 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 498 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT);
-#line 497 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 499 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->central_area_layouter;
-#line 497 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
#line 499 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
+#line 501 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3180 "PublishingUI.c"
+#line 3316 "PublishingUI.c"
}
-static void publishing_ui_publishing_dialog_set_standard_window_mode (PublishingUIPublishingDialog* self) {
+static void
+publishing_ui_publishing_dialog_set_standard_window_mode (PublishingUIPublishingDialog* self)
+{
GtkBox* _tmp0_;
-#line 502 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 504 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 503 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 505 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT);
-#line 504 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 506 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->central_area_layouter;
-#line 504 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
#line 506 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
+#line 508 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3196 "PublishingUI.c"
+#line 3334 "PublishingUI.c"
}
-static void publishing_ui_publishing_dialog_set_free_sizable_window_mode (PublishingUIPublishingDialog* self) {
-#line 509 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void
+publishing_ui_publishing_dialog_set_free_sizable_window_mode (PublishingUIPublishingDialog* self)
+{
+#line 511 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 510 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 512 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 3205 "PublishingUI.c"
+#line 3345 "PublishingUI.c"
}
-static void publishing_ui_publishing_dialog_clear_free_sizable_window_mode (PublishingUIPublishingDialog* self) {
-#line 513 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void
+publishing_ui_publishing_dialog_clear_free_sizable_window_mode (PublishingUIPublishingDialog* self)
+{
+#line 515 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 514 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3214 "PublishingUI.c"
+#line 3356 "PublishingUI.c"
}
-SpitPublishingDialogPane* publishing_ui_publishing_dialog_get_active_pane (PublishingUIPublishingDialog* self) {
+SpitPublishingDialogPane*
+publishing_ui_publishing_dialog_get_active_pane (PublishingUIPublishingDialog* self)
+{
SpitPublishingDialogPane* result = NULL;
SpitPublishingDialogPane* _tmp0_;
SpitPublishingDialogPane* _tmp1_;
-#line 517 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 519 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), NULL);
-#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->active_pane;
-#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
result = _tmp1_;
-#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 3232 "PublishingUI.c"
+#line 3376 "PublishingUI.c"
}
-void publishing_ui_publishing_dialog_set_close_button_mode (PublishingUIPublishingDialog* self) {
+void
+publishing_ui_publishing_dialog_set_close_button_mode (PublishingUIPublishingDialog* self)
+{
GtkButton* _tmp0_;
GtkButton* _tmp1_;
-#line 521 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 522 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 524 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->close_cancel_button;
-#line 522 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 524 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_button_set_label (_tmp0_, _ ("_Close"));
-#line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 525 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = self->priv->close_cancel_button;
-#line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 525 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 3249 "PublishingUI.c"
+#line 3395 "PublishingUI.c"
}
-void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublishingDialog* self) {
+void
+publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublishingDialog* self)
+{
GtkButton* _tmp0_;
-#line 526 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 528 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->close_cancel_button;
-#line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_button_set_label (_tmp0_, _ ("_Cancel"));
-#line 3261 "PublishingUI.c"
+#line 3409 "PublishingUI.c"
}
-void publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* self) {
+void
+publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* self)
+{
GtkComboBox* _tmp0_;
-#line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 532 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 531 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->service_selector_box;
-#line 531 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 3273 "PublishingUI.c"
+#line 3423 "PublishingUI.c"
}
-void publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialog* self) {
+void
+publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialog* self)
+{
GtkComboBox* _tmp0_;
-#line 534 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 536 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 535 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 537 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->service_selector_box;
-#line 535 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 537 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3285 "PublishingUI.c"
+#line 3437 "PublishingUI.c"
}
-void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* self, SpitPublishingDialogPane* pane) {
+void
+publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* self,
+ SpitPublishingDialogPane* pane)
+{
SpitPublishingDialogPane* _tmp0_;
GtkBox* _tmp6_;
- SpitPublishingDialogPane* _tmp7_;
+ GtkWidget* _tmp7_;
GtkWidget* _tmp8_;
- GtkWidget* _tmp9_;
SpitPublishingDialogPaneGeometryOptions geometry_options = 0;
- SpitPublishingDialogPane* _tmp10_;
+ SpitPublishingDialogPaneGeometryOptions _tmp9_;
SpitPublishingDialogPaneGeometryOptions _tmp11_;
- SpitPublishingDialogPaneGeometryOptions _tmp12_;
- SpitPublishingDialogPaneGeometryOptions _tmp14_;
- SpitPublishingDialogPane* _tmp15_;
- SpitPublishingDialogPane* _tmp16_;
- SpitPublishingDialogPane* _tmp17_;
-#line 538 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ SpitPublishingDialogPane* _tmp12_;
+#line 540 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 538 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 540 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (pane));
-#line 539 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_debug ("PublishingUI.vala:539: PublishingDialog: install_pane( ): invoked.");
#line 541 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_debug ("PublishingUI.vala:541: PublishingDialog: install_pane( ): invoked.");
+#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->active_pane;
-#line 541 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp0_ != NULL) {
-#line 3313 "PublishingUI.c"
+#line 3463 "PublishingUI.c"
SpitPublishingDialogPane* _tmp1_;
GtkBox* _tmp2_;
SpitPublishingDialogPane* _tmp3_;
GtkWidget* _tmp4_;
GtkWidget* _tmp5_;
-#line 542 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_debug ("PublishingUI.vala:542: PublishingDialog: install_pane( ): a pane is al" \
-"ready installed; removing it.");
#line 544 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_debug ("PublishingUI.vala:544: PublishingDialog: install_pane( ): a pane is al" \
+"ready installed; removing it.");
+#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = self->priv->active_pane;
-#line 544 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
spit_publishing_dialog_pane_on_pane_uninstalled (_tmp1_);
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = self->priv->central_area_layouter;
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp3_ = self->priv->active_pane;
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = spit_publishing_dialog_pane_get_widget (_tmp3_);
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp5_ = _tmp4_;
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), _tmp5_);
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (_tmp5_);
-#line 3337 "PublishingUI.c"
+#line 3487 "PublishingUI.c"
}
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp6_ = self->priv->central_area_layouter;
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp7_ = pane;
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp8_ = spit_publishing_dialog_pane_get_widget (_tmp7_);
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp9_ = _tmp8_;
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_box_pack_start (_tmp6_, _tmp9_, TRUE, TRUE, (guint) 0);
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (_tmp9_);
-#line 549 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp10_ = pane;
+#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp7_ = spit_publishing_dialog_pane_get_widget (pane);
+#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp8_ = _tmp7_;
+#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_box_pack_start (_tmp6_, _tmp8_, TRUE, TRUE, (guint) 0);
+#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (_tmp8_);
#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp11_ = spit_publishing_dialog_pane_get_preferred_geometry (_tmp10_);
-#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- geometry_options = _tmp11_;
-#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp12_ = geometry_options;
+ gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) {
-#line 554 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- publishing_ui_publishing_dialog_set_large_window_mode (self);
-#line 3365 "PublishingUI.c"
- } else {
- SpitPublishingDialogPaneGeometryOptions _tmp13_;
+ geometry_options = spit_publishing_dialog_pane_get_preferred_geometry (pane);
#line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp13_ = geometry_options;
+ _tmp9_ = geometry_options;
#line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if ((_tmp13_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) {
+ if ((_tmp9_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) {
#line 556 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ publishing_ui_publishing_dialog_set_large_window_mode (self);
+#line 3509 "PublishingUI.c"
+ } else {
+ SpitPublishingDialogPaneGeometryOptions _tmp10_;
+#line 557 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp10_ = geometry_options;
+#line 557 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if ((_tmp10_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) {
+#line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_set_colossal_window_mode (self);
-#line 3374 "PublishingUI.c"
+#line 3518 "PublishingUI.c"
} else {
-#line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 560 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_set_standard_window_mode (self);
-#line 3378 "PublishingUI.c"
+#line 3522 "PublishingUI.c"
}
}
-#line 560 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp14_ = geometry_options;
-#line 560 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) {
-#line 561 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 562 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp11_ = geometry_options;
+#line 562 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if ((_tmp11_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) {
+#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_set_free_sizable_window_mode (self);
-#line 3387 "PublishingUI.c"
+#line 3531 "PublishingUI.c"
} else {
-#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_clear_free_sizable_window_mode (self);
-#line 3391 "PublishingUI.c"
+#line 3535 "PublishingUI.c"
}
-#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp15_ = pane;
-#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp16_ = _g_object_ref0 (_tmp15_);
-#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp12_ = _g_object_ref0 (pane);
+#line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->active_pane);
-#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->active_pane = _tmp16_;
-#line 566 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp17_ = pane;
-#line 566 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- spit_publishing_dialog_pane_on_pane_installed (_tmp17_);
-#line 3405 "PublishingUI.c"
+#line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ self->priv->active_pane = _tmp12_;
+#line 568 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ spit_publishing_dialog_pane_on_pane_installed (pane);
+#line 3545 "PublishingUI.c"
}
-gint publishing_ui_publishing_dialog_run (PublishingUIPublishingDialog* self) {
+gint
+publishing_ui_publishing_dialog_run (PublishingUIPublishingDialog* self)
+{
gint result = 0;
gint _result_ = 0;
- gint _tmp0_;
-#line 569 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 571 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), 0);
-#line 570 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- publishing_ui_publishing_dialog_on_service_changed (self);
-#line 572 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 572 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _result_ = _tmp0_;
+ publishing_ui_publishing_dialog_on_service_changed (self);
#line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _result_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 576 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->host);
-#line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->host = NULL;
#line 576 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ self->priv->host = NULL;
+#line 578 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
result = _result_;
-#line 576 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 578 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 3429 "PublishingUI.c"
+#line 3568 "PublishingUI.c"
}
-static void publishing_ui_publishing_dialog_class_init (PublishingUIPublishingDialogClass * klass) {
+static void
+publishing_ui_publishing_dialog_class_init (PublishingUIPublishingDialogClass * klass)
+{
#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_parent_class = g_type_class_peek_parent (klass);
#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_type_class_add_private (klass, sizeof (PublishingUIPublishingDialogPrivate));
#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_ui_publishing_dialog_finalize;
-#line 3440 "PublishingUI.c"
+#line 3581 "PublishingUI.c"
}
-static void publishing_ui_publishing_dialog_instance_init (PublishingUIPublishingDialog * self) {
+static void
+publishing_ui_publishing_dialog_instance_init (PublishingUIPublishingDialog * self)
+{
#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv = PUBLISHING_UI_PUBLISHING_DIALOG_GET_PRIVATE (self);
-#line 3447 "PublishingUI.c"
+#line 3590 "PublishingUI.c"
}
-static void publishing_ui_publishing_dialog_finalize (GObject * obj) {
+static void
+publishing_ui_publishing_dialog_finalize (GObject * obj)
+{
PublishingUIPublishingDialog * self;
#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, PublishingUIPublishingDialog);
@@ -3477,11 +3622,13 @@ static void publishing_ui_publishing_dialog_finalize (GObject * obj) {
spit_pluggable_info_destroy (&self->priv->info);
#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (publishing_ui_publishing_dialog_parent_class)->finalize (obj);
-#line 3473 "PublishingUI.c"
+#line 3618 "PublishingUI.c"
}
-GType publishing_ui_publishing_dialog_get_type (void) {
+GType
+publishing_ui_publishing_dialog_get_type (void)
+{
static volatile gsize publishing_ui_publishing_dialog_type_id__volatile = 0;
if (g_once_init_enter (&publishing_ui_publishing_dialog_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingUIPublishingDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_ui_publishing_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingUIPublishingDialog), 0, (GInstanceInitFunc) publishing_ui_publishing_dialog_instance_init, NULL };
@@ -3493,7 +3640,11 @@ GType publishing_ui_publishing_dialog_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) {
@@ -3505,7 +3656,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);
}
diff --git a/src/publishing/PublishingUI.vala b/src/publishing/PublishingUI.vala
index c975564..3d4f609 100644
--- a/src/publishing/PublishingUI.vala
+++ b/src/publishing/PublishingUI.vala
@@ -161,11 +161,13 @@ public class PublishingDialog : Gtk.Dialog {
protected PublishingDialog(Gee.Collection<MediaSource> to_publish) {
assert(to_publish.size > 0);
- bool use_header = false;
- Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
- Object(use_header_bar: use_header ? 1 : 0);
- if (use_header)
+ bool use_header = Resources.use_header_bar() == 1;
+ Object(use_header_bar: Resources.use_header_bar());
+ if (use_header) {
((Gtk.HeaderBar) get_header_bar()).set_show_close_button(false);
+ } else {
+ get_content_area().set_spacing(6);
+ }
resizable = false;
modal = true;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 23:03:36 +0000