summaryrefslogtreecommitdiff
path: root/src/publishing/PublishingPluginHost.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 15:55:20 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 15:55:20 +0100
commitf6140ff1c9ec493d947da5b346508846e7a1a06f (patch)
treec01b9164ee4b0d46b6670ccee45f6181c6237d7f /src/publishing/PublishingPluginHost.c
parent0f67b3cc674377559e66c5a6729fd499049a992f (diff)
parent2492891f112caac6076ce49721d9d5d78a152c3a (diff)
Update upstream source from tag 'upstream/0.26.4'
Update to upstream version '0.26.4' with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4
Diffstat (limited to 'src/publishing/PublishingPluginHost.c')
-rw-r--r--src/publishing/PublishingPluginHost.c510
1 files changed, 253 insertions, 257 deletions
diff --git a/src/publishing/PublishingPluginHost.c b/src/publishing/PublishingPluginHost.c
index 63e16c4..54f1495 100644
--- a/src/publishing/PublishingPluginHost.c
+++ b/src/publishing/PublishingPluginHost.c
@@ -1,4 +1,4 @@
-/* PublishingPluginHost.c generated by valac 0.34.7, the Vala compiler
+/* PublishingPluginHost.c generated by valac 0.36.6, the Vala compiler
* generated from PublishingPluginHost.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -166,7 +166,7 @@ struct _SpitPublishingConcretePublishingHostPrivate {
static gpointer spit_publishing_concrete_publishing_host_parent_class = NULL;
-static SpitPublishingPluginHostIface* spit_publishing_concrete_publishing_host_spit_publishing_plugin_host_parent_iface = NULL;
+static SpitPublishingPluginHostIface * spit_publishing_concrete_publishing_host_spit_publishing_plugin_host_parent_iface = NULL;
GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST;
GType spit_publishing_concrete_publishing_host_get_type (void) G_GNUC_CONST;
@@ -238,7 +238,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
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);
-static void spit_publishing_concrete_publishing_host_finalize (GObject* obj);
+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);
@@ -258,7 +258,7 @@ static SpitPublishingPublishable** _vala_array_dup20 (SpitPublishingPublishable*
#line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
for (i = 0; i < length; i++) {
#line 261 "PublishingPluginHost.c"
- SpitPublishingPublishable* _tmp0_ = NULL;
+ 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"
@@ -273,16 +273,16 @@ static SpitPublishingPublishable** _vala_array_dup20 (SpitPublishingPublishable*
SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_construct (GType object_type, SpitPublishingService* service, PublishingUIPublishingDialog* dialog, SpitPublishingPublishable** publishables, int publishables_length1) {
SpitPublishingConcretePublishingHost * self = NULL;
- SpitPublishingService* _tmp0_ = NULL;
- PublishingUIPublishingDialog* _tmp1_ = NULL;
- SpitPublishingPublishable** _tmp2_ = NULL;
- gint _tmp2__length1 = 0;
- SpitPublishingPublishable** _tmp3_ = NULL;
- gint _tmp3__length1 = 0;
- SpitPublishingPublishable** _tmp4_ = NULL;
- gint _tmp4__length1 = 0;
- SpitPublishingService* _tmp9_ = NULL;
- SpitPublishingPublisher* _tmp10_ = NULL;
+ SpitPublishingService* _tmp0_;
+ PublishingUIPublishingDialog* _tmp1_;
+ SpitPublishingPublishable** _tmp2_;
+ gint _tmp2__length1;
+ SpitPublishingPublishable** _tmp3_;
+ gint _tmp3__length1;
+ SpitPublishingPublishable** _tmp4_;
+ gint _tmp4__length1;
+ SpitPublishingService* _tmp9_;
+ SpitPublishingPublisher* _tmp10_;
#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"
@@ -328,7 +328,7 @@ SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_c
#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_ = NULL;
+ SpitPublishingPublishable* _tmp5_;
SpitPublishingPublishable* curr_publishable = NULL;
#line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp5_ = _g_object_ref0 (curr_publishable_collection[curr_publishable_it]);
@@ -336,9 +336,9 @@ SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_c
curr_publishable = _tmp5_;
#line 338 "PublishingPluginHost.c"
{
- SpitPublishingPublisherMediaType _tmp6_ = 0;
- SpitPublishingPublishable* _tmp7_ = NULL;
- SpitPublishingPublisherMediaType _tmp8_ = 0;
+ SpitPublishingPublisherMediaType _tmp6_;
+ SpitPublishingPublishable* _tmp7_;
+ SpitPublishingPublisherMediaType _tmp8_;
#line 31 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp6_ = self->priv->media_type;
#line 31 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -375,8 +375,8 @@ SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_n
static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPublishingConcretePublishingHost* self) {
- SpitPublishingLoginCallback _tmp0_ = NULL;
- void* _tmp0__target = NULL;
+ SpitPublishingLoginCallback _tmp0_;
+ void* _tmp0__target;
#line 36 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self));
#line 37 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -386,8 +386,8 @@ static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPubli
#line 37 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
if (_tmp0_ != NULL) {
#line 389 "PublishingPluginHost.c"
- SpitPublishingLoginCallback _tmp1_ = NULL;
- void* _tmp1__target = NULL;
+ SpitPublishingLoginCallback _tmp1_;
+ void* _tmp1__target;
#line 38 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp1_ = self->priv->current_login_callback;
#line 38 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -400,8 +400,8 @@ static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPubli
static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingConcretePublishingHost* self) {
- SpitPublishingPublishable** _tmp0_ = NULL;
- gint _tmp0__length1 = 0;
+ SpitPublishingPublishable** _tmp0_;
+ gint _tmp0__length1;
#line 41 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self));
#line 42 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -421,7 +421,7 @@ static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingCon
#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"
- SpitPublishingPublishable* _tmp1_ = NULL;
+ SpitPublishingPublishable* _tmp1_;
SpitPublishingPublishable* publishable = NULL;
#line 42 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp1_ = _g_object_ref0 (publishable_collection[publishable_it]);
@@ -429,7 +429,7 @@ static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingCon
publishable = _tmp1_;
#line 431 "PublishingPluginHost.c"
{
- SpitPublishingPublishable* _tmp2_ = NULL;
+ SpitPublishingPublishable* _tmp2_;
#line 43 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp2_ = publishable;
#line 43 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -444,23 +444,23 @@ static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingCon
static void spit_publishing_concrete_publishing_host_report_plugin_upload_progress (SpitPublishingConcretePublishingHost* self, gint file_number, gdouble fraction_complete) {
- PublishingUIPublishingDialog* _tmp0_ = NULL;
- SpitPublishingDialogPane* _tmp1_ = NULL;
- SpitPublishingDialogPane* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ PublishingUIPublishingDialog* _tmp0_;
+ SpitPublishingDialogPane* _tmp1_;
+ SpitPublishingDialogPane* _tmp2_;
+ gboolean _tmp3_;
PublishingUIProgressPane* pane = NULL;
- PublishingUIPublishingDialog* _tmp4_ = NULL;
- SpitPublishingDialogPane* _tmp5_ = NULL;
+ PublishingUIPublishingDialog* _tmp4_;
+ SpitPublishingDialogPane* _tmp5_;
gchar* status_string = NULL;
- gint _tmp6_ = 0;
- SpitPublishingPublishable** _tmp7_ = NULL;
- gint _tmp7__length1 = 0;
- gchar* _tmp8_ = NULL;
+ gint _tmp6_;
+ SpitPublishingPublishable** _tmp7_;
+ gint _tmp7__length1;
+ gchar* _tmp8_;
gdouble status_fraction = 0.0;
- gdouble _tmp9_ = 0.0;
- PublishingUIProgressPane* _tmp10_ = NULL;
- const gchar* _tmp11_ = NULL;
- gdouble _tmp12_ = 0.0;
+ gdouble _tmp9_;
+ PublishingUIProgressPane* _tmp10_;
+ const gchar* _tmp11_;
+ gdouble _tmp12_;
#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"
@@ -517,8 +517,8 @@ static void spit_publishing_concrete_publishing_host_report_plugin_upload_progre
static void spit_publishing_concrete_publishing_host_install_progress_pane (SpitPublishingConcretePublishingHost* self) {
PublishingUIProgressPane* progress_pane = NULL;
- PublishingUIProgressPane* _tmp0_ = NULL;
- PublishingUIPublishingDialog* _tmp1_ = NULL;
+ PublishingUIProgressPane* _tmp0_;
+ PublishingUIPublishingDialog* _tmp1_;
#line 61 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self));
#line 62 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -540,10 +540,10 @@ static void spit_publishing_concrete_publishing_host_install_progress_pane (Spit
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_ = NULL;
- PublishingUIPublishingDialog* _tmp4_ = NULL;
- SpitPublishingDialogPane* _tmp5_ = NULL;
- SpitPublishingPluginHostButtonMode _tmp6_ = 0;
+ SpitPublishingPublisher* _tmp1_;
+ PublishingUIPublishingDialog* _tmp4_;
+ SpitPublishingDialogPane* _tmp5_;
+ SpitPublishingPluginHostButtonMode _tmp6_;
#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"
@@ -559,8 +559,8 @@ static void spit_publishing_concrete_publishing_host_real_install_dialog_pane (S
_tmp0_ = TRUE;
#line 560 "PublishingPluginHost.c"
} else {
- SpitPublishingPublisher* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ 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"
@@ -592,113 +592,107 @@ static void spit_publishing_concrete_publishing_host_real_install_dialog_pane (S
static void spit_publishing_concrete_publishing_host_real_post_error (SpitPublishingPluginHost* base, GError* err) {
SpitPublishingConcretePublishingHost * self;
gchar* msg = NULL;
- const gchar* _tmp0_ = NULL;
- SpitPublishingPublisher* _tmp1_ = NULL;
- SpitPublishingService* _tmp2_ = NULL;
- SpitPublishingService* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- const gchar* _tmp7_ = NULL;
- GError* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- PublishingUIPublishingDialog* _tmp16_ = NULL;
- const gchar* _tmp17_ = NULL;
- PublishingUIStaticMessagePane* _tmp18_ = NULL;
- PublishingUIStaticMessagePane* _tmp19_ = NULL;
- PublishingUIPublishingDialog* _tmp20_ = NULL;
- PublishingUIPublishingDialog* _tmp21_ = NULL;
- SpitPublishingPublisher* _tmp22_ = NULL;
+ SpitPublishingPublisher* _tmp0_;
+ SpitPublishingService* _tmp1_;
+ SpitPublishingService* _tmp2_;
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ const gchar* _tmp6_;
+ GError* _tmp7_;
+ const gchar* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ const gchar* _tmp12_;
+ gchar* _tmp13_;
+ PublishingUIPublishingDialog* _tmp14_;
+ const gchar* _tmp15_;
+ PublishingUIStaticMessagePane* _tmp16_;
+ PublishingUIStaticMessagePane* _tmp17_;
+ PublishingUIPublishingDialog* _tmp18_;
+ PublishingUIPublishingDialog* _tmp19_;
+ SpitPublishingPublisher* _tmp20_;
#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"
- _tmp0_ = _ ("Publishing to %s can’t continue because an error occurred:");
-#line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp1_ = self->priv->active_publisher;
+ _tmp0_ = self->priv->active_publisher;
#line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp2_ = spit_publishing_publisher_get_service (_tmp1_);
+ _tmp1_ = spit_publishing_publisher_get_service (_tmp0_);
#line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp4_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp5_ = g_strdup_printf (_tmp0_, _tmp4_);
+ _tmp4_ = g_strdup_printf (_ ("Publishing to %s can’t continue because an error occurred:"), _tmp3_);
#line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp2_);
#line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- msg = _tmp6_;
+ msg = _tmp5_;
#line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp7_ = msg;
+ _tmp6_ = msg;
#line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp8_ = err;
+ _tmp7_ = err;
#line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp9_ = _tmp8_->message;
+ _tmp8_ = _tmp7_->message;
#line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp10_ = g_markup_printf_escaped ("\n\n<i>%s</i>\n\n", _tmp9_);
+ _tmp9_ = g_markup_printf_escaped ("\n\n<i>%s</i>\n\n", _tmp8_);
#line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp11_ = _tmp10_;
+ _tmp10_ = _tmp9_;
#line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp12_ = g_strconcat (_tmp7_, _tmp11_, NULL);
+ _tmp11_ = g_strconcat (_tmp6_, _tmp10_, 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 = _tmp12_;
+ msg = _tmp11_;
#line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _g_free0 (_tmp11_);
-#line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp13_ = msg;
+ _g_free0 (_tmp10_);
#line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp14_ = _ ("To try publishing to another service, select one from the above menu.");
+ _tmp12_ = msg;
#line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp15_ = g_strconcat (_tmp13_, _tmp14_, NULL);
+ _tmp13_ = g_strconcat (_tmp12_, _ ("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 = _tmp15_;
+ msg = _tmp13_;
#line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp16_ = self->priv->dialog;
+ _tmp14_ = self->priv->dialog;
#line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp17_ = msg;
+ _tmp15_ = msg;
#line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp18_ = publishing_ui_static_message_pane_new (_tmp17_, TRUE);
+ _tmp16_ = publishing_ui_static_message_pane_new (_tmp15_, TRUE);
#line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp19_ = _tmp18_;
+ _tmp17_ = _tmp16_;
#line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- publishing_ui_publishing_dialog_install_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
+ publishing_ui_publishing_dialog_install_pane (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
#line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _g_object_unref0 (_tmp19_);
+ _g_object_unref0 (_tmp17_);
#line 87 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp20_ = self->priv->dialog;
+ _tmp18_ = self->priv->dialog;
#line 87 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- publishing_ui_publishing_dialog_set_close_button_mode (_tmp20_);
+ publishing_ui_publishing_dialog_set_close_button_mode (_tmp18_);
#line 88 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp21_ = self->priv->dialog;
+ _tmp19_ = self->priv->dialog;
#line 88 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- publishing_ui_publishing_dialog_unlock_service (_tmp21_);
+ publishing_ui_publishing_dialog_unlock_service (_tmp19_);
#line 90 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp22_ = self->priv->active_publisher;
+ _tmp20_ = self->priv->active_publisher;
#line 90 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- spit_publishing_publisher_stop (_tmp22_);
+ spit_publishing_publisher_stop (_tmp20_);
#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 694 "PublishingPluginHost.c"
+#line 688 "PublishingPluginHost.c"
}
static void spit_publishing_concrete_publishing_host_real_stop_publishing (SpitPublishingPluginHost* base) {
SpitPublishingConcretePublishingHost * self;
- SpitPublishingPublisher* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ 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"
@@ -710,26 +704,26 @@ static void spit_publishing_concrete_publishing_host_real_stop_publishing (SpitP
_tmp1_ = spit_publishing_publisher_is_running (_tmp0_);
#line 101 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
if (_tmp1_) {
-#line 712 "PublishingPluginHost.c"
- SpitPublishingPublisher* _tmp2_ = NULL;
+#line 706 "PublishingPluginHost.c"
+ SpitPublishingPublisher* _tmp2_;
#line 102 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp2_ = self->priv->active_publisher;
#line 102 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
spit_publishing_publisher_stop (_tmp2_);
-#line 718 "PublishingPluginHost.c"
+#line 712 "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 724 "PublishingPluginHost.c"
+#line 718 "PublishingPluginHost.c"
}
void spit_publishing_concrete_publishing_host_start_publishing (SpitPublishingConcretePublishingHost* self) {
- SpitPublishingPublisher* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- SpitPublishingPublisher* _tmp2_ = NULL;
+ SpitPublishingPublisher* _tmp0_;
+ gboolean _tmp1_;
+ SpitPublishingPublisher* _tmp2_;
#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"
@@ -740,7 +734,7 @@ void spit_publishing_concrete_publishing_host_start_publishing (SpitPublishingCo
if (_tmp1_) {
#line 111 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return;
-#line 742 "PublishingPluginHost.c"
+#line 736 "PublishingPluginHost.c"
}
#line 113 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
g_debug ("PublishingPluginHost.vala:113: ConcretePublishingHost.start_publishing" \
@@ -749,15 +743,15 @@ void spit_publishing_concrete_publishing_host_start_publishing (SpitPublishingCo
_tmp2_ = self->priv->active_publisher;
#line 115 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
spit_publishing_publisher_start (_tmp2_);
-#line 750 "PublishingPluginHost.c"
+#line 744 "PublishingPluginHost.c"
}
static SpitPublishingPublisher* spit_publishing_concrete_publishing_host_real_get_publisher (SpitPublishingPluginHost* base) {
SpitPublishingConcretePublishingHost * self;
SpitPublishingPublisher* result = NULL;
- SpitPublishingPublisher* _tmp0_ = NULL;
- SpitPublishingPublisher* _tmp1_ = NULL;
+ SpitPublishingPublisher* _tmp0_;
+ SpitPublishingPublisher* _tmp1_;
#line 118 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
#line 119 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -768,17 +762,17 @@ static SpitPublishingPublisher* spit_publishing_concrete_publishing_host_real_ge
result = _tmp1_;
#line 119 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return result;
-#line 769 "PublishingPluginHost.c"
+#line 763 "PublishingPluginHost.c"
}
static void spit_publishing_concrete_publishing_host_real_install_static_message_pane (SpitPublishingPluginHost* base, const gchar* message, SpitPublishingPluginHostButtonMode button_mode) {
SpitPublishingConcretePublishingHost * self;
- SpitPublishingPluginHostButtonMode _tmp0_ = 0;
- PublishingUIPublishingDialog* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- PublishingUIStaticMessagePane* _tmp3_ = NULL;
- PublishingUIStaticMessagePane* _tmp4_ = NULL;
+ SpitPublishingPluginHostButtonMode _tmp0_;
+ PublishingUIPublishingDialog* _tmp1_;
+ const gchar* _tmp2_;
+ PublishingUIStaticMessagePane* _tmp3_;
+ PublishingUIStaticMessagePane* _tmp4_;
#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"
@@ -799,17 +793,17 @@ static void spit_publishing_concrete_publishing_host_real_install_static_message
publishing_ui_publishing_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (_tmp4_);
-#line 800 "PublishingPluginHost.c"
+#line 794 "PublishingPluginHost.c"
}
static void spit_publishing_concrete_publishing_host_real_install_pango_message_pane (SpitPublishingPluginHost* base, const gchar* markup, SpitPublishingPluginHostButtonMode button_mode) {
SpitPublishingConcretePublishingHost * self;
- SpitPublishingPluginHostButtonMode _tmp0_ = 0;
- PublishingUIPublishingDialog* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- PublishingUIStaticMessagePane* _tmp3_ = NULL;
- PublishingUIStaticMessagePane* _tmp4_ = NULL;
+ SpitPublishingPluginHostButtonMode _tmp0_;
+ PublishingUIPublishingDialog* _tmp1_;
+ const gchar* _tmp2_;
+ PublishingUIStaticMessagePane* _tmp3_;
+ PublishingUIStaticMessagePane* _tmp4_;
#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"
@@ -830,19 +824,19 @@ static void spit_publishing_concrete_publishing_host_real_install_pango_message_
publishing_ui_publishing_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
#line 134 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (_tmp4_);
-#line 831 "PublishingPluginHost.c"
+#line 825 "PublishingPluginHost.c"
}
static void spit_publishing_concrete_publishing_host_real_install_success_pane (SpitPublishingPluginHost* base) {
SpitPublishingConcretePublishingHost * self;
- PublishingUIPublishingDialog* _tmp0_ = NULL;
- SpitPublishingPublisherMediaType _tmp1_ = 0;
- SpitPublishingPublishable** _tmp2_ = NULL;
- gint _tmp2__length1 = 0;
- PublishingUISuccessPane* _tmp3_ = NULL;
- PublishingUISuccessPane* _tmp4_ = NULL;
- PublishingUIPublishingDialog* _tmp5_ = NULL;
+ PublishingUIPublishingDialog* _tmp0_;
+ SpitPublishingPublisherMediaType _tmp1_;
+ SpitPublishingPublishable** _tmp2_;
+ gint _tmp2__length1;
+ PublishingUISuccessPane* _tmp3_;
+ PublishingUISuccessPane* _tmp4_;
+ PublishingUIPublishingDialog* _tmp5_;
#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"
@@ -867,15 +861,15 @@ static void spit_publishing_concrete_publishing_host_real_install_success_pane (
publishing_ui_publishing_dialog_set_close_button_mode (_tmp5_);
#line 144 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
spit_publishing_concrete_publishing_host_clean_up (self);
-#line 868 "PublishingPluginHost.c"
+#line 862 "PublishingPluginHost.c"
}
static void spit_publishing_concrete_publishing_host_real_install_account_fetch_wait_pane (SpitPublishingPluginHost* base) {
SpitPublishingConcretePublishingHost * self;
- PublishingUIPublishingDialog* _tmp0_ = NULL;
- PublishingUIAccountFetchWaitPane* _tmp1_ = NULL;
- PublishingUIAccountFetchWaitPane* _tmp2_ = NULL;
+ PublishingUIPublishingDialog* _tmp0_;
+ PublishingUIAccountFetchWaitPane* _tmp1_;
+ PublishingUIAccountFetchWaitPane* _tmp2_;
#line 147 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
#line 148 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -890,15 +884,15 @@ 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 891 "PublishingPluginHost.c"
+#line 885 "PublishingPluginHost.c"
}
static void spit_publishing_concrete_publishing_host_real_install_login_wait_pane (SpitPublishingPluginHost* base) {
SpitPublishingConcretePublishingHost * self;
- PublishingUIPublishingDialog* _tmp0_ = NULL;
- PublishingUILoginWaitPane* _tmp1_ = NULL;
- PublishingUILoginWaitPane* _tmp2_ = NULL;
+ PublishingUIPublishingDialog* _tmp0_;
+ PublishingUILoginWaitPane* _tmp1_;
+ PublishingUILoginWaitPane* _tmp2_;
#line 152 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
#line 153 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -911,25 +905,25 @@ 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 912 "PublishingPluginHost.c"
+#line 906 "PublishingPluginHost.c"
}
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 919 "PublishingPluginHost.c"
+#line 913 "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) {
SpitPublishingConcretePublishingHost * self;
PublishingUILoginWelcomePane* login_pane = NULL;
- const gchar* _tmp0_ = NULL;
- PublishingUILoginWelcomePane* _tmp1_ = NULL;
- SpitPublishingLoginCallback _tmp2_ = NULL;
- void* _tmp2__target = NULL;
- PublishingUIPublishingDialog* _tmp3_ = NULL;
+ const gchar* _tmp0_;
+ PublishingUILoginWelcomePane* _tmp1_;
+ SpitPublishingLoginCallback _tmp2_;
+ void* _tmp2__target;
+ PublishingUIPublishingDialog* _tmp3_;
#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"
@@ -958,70 +952,70 @@ static void spit_publishing_concrete_publishing_host_real_install_welcome_pane (
publishing_ui_publishing_dialog_install_pane (_tmp3_, 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 959 "PublishingPluginHost.c"
+#line 953 "PublishingPluginHost.c"
}
static void spit_publishing_concrete_publishing_host_real_set_service_locked (SpitPublishingPluginHost* base, gboolean locked) {
SpitPublishingConcretePublishingHost * self;
- gboolean _tmp0_ = FALSE;
+ 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 972 "PublishingPluginHost.c"
- PublishingUIPublishingDialog* _tmp1_ = NULL;
+#line 966 "PublishingPluginHost.c"
+ PublishingUIPublishingDialog* _tmp1_;
#line 169 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp1_ = self->priv->dialog;
#line 169 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
publishing_ui_publishing_dialog_lock_service (_tmp1_);
-#line 978 "PublishingPluginHost.c"
+#line 972 "PublishingPluginHost.c"
} else {
- PublishingUIPublishingDialog* _tmp2_ = NULL;
+ PublishingUIPublishingDialog* _tmp2_;
#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp2_ = self->priv->dialog;
#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
publishing_ui_publishing_dialog_unlock_service (_tmp2_);
-#line 985 "PublishingPluginHost.c"
+#line 979 "PublishingPluginHost.c"
}
}
void spit_publishing_concrete_publishing_host_set_button_mode (SpitPublishingConcretePublishingHost* self, SpitPublishingPluginHostButtonMode mode) {
- SpitPublishingPluginHostButtonMode _tmp0_ = 0;
+ SpitPublishingPluginHostButtonMode _tmp0_;
#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 998 "PublishingPluginHost.c"
- PublishingUIPublishingDialog* _tmp1_ = NULL;
+#line 992 "PublishingPluginHost.c"
+ PublishingUIPublishingDialog* _tmp1_;
#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp1_ = self->priv->dialog;
#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
publishing_ui_publishing_dialog_set_close_button_mode (_tmp1_);
-#line 1004 "PublishingPluginHost.c"
+#line 998 "PublishingPluginHost.c"
} else {
- SpitPublishingPluginHostButtonMode _tmp2_ = 0;
+ 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 1011 "PublishingPluginHost.c"
- PublishingUIPublishingDialog* _tmp3_ = NULL;
+#line 1005 "PublishingPluginHost.c"
+ PublishingUIPublishingDialog* _tmp3_;
#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp3_ = self->priv->dialog;
#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
publishing_ui_publishing_dialog_set_cancel_button_mode (_tmp3_);
-#line 1017 "PublishingPluginHost.c"
+#line 1011 "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 1021 "PublishingPluginHost.c"
+#line 1015 "PublishingPluginHost.c"
}
}
}
@@ -1029,9 +1023,9 @@ void spit_publishing_concrete_publishing_host_set_button_mode (SpitPublishingCon
static void spit_publishing_concrete_publishing_host_real_set_dialog_default_widget (SpitPublishingPluginHost* base, GtkWidget* widget) {
SpitPublishingConcretePublishingHost * self;
- GtkWidget* _tmp0_ = NULL;
- PublishingUIPublishingDialog* _tmp1_ = NULL;
- GtkWidget* _tmp2_ = NULL;
+ GtkWidget* _tmp0_;
+ PublishingUIPublishingDialog* _tmp1_;
+ GtkWidget* _tmp2_;
#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"
@@ -1046,14 +1040,14 @@ static void spit_publishing_concrete_publishing_host_real_set_dialog_default_wid
_tmp2_ = widget;
#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 1046 "PublishingPluginHost.c"
+#line 1040 "PublishingPluginHost.c"
}
static SpitPublishingPublisherMediaType spit_publishing_concrete_publishing_host_real_get_publishable_media_type (SpitPublishingPluginHost* base) {
SpitPublishingConcretePublishingHost * self;
SpitPublishingPublisherMediaType result = 0;
- SpitPublishingPublisherMediaType _tmp0_ = 0;
+ SpitPublishingPublisherMediaType _tmp0_;
#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
#line 189 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1062,7 +1056,7 @@ static SpitPublishingPublisherMediaType spit_publishing_concrete_publishing_host
result = _tmp0_;
#line 189 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return result;
-#line 1062 "PublishingPluginHost.c"
+#line 1056 "PublishingPluginHost.c"
}
@@ -1073,29 +1067,29 @@ static SpitPublishingPublishable** _vala_array_dup21 (SpitPublishingPublishable*
result = g_new0 (SpitPublishingPublishable*, length + 1);
#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
for (i = 0; i < length; i++) {
-#line 1073 "PublishingPluginHost.c"
- SpitPublishingPublishable* _tmp0_ = NULL;
+#line 1067 "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 1079 "PublishingPluginHost.c"
+#line 1073 "PublishingPluginHost.c"
}
#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return result;
-#line 1083 "PublishingPluginHost.c"
+#line 1077 "PublishingPluginHost.c"
}
static SpitPublishingPublishable** spit_publishing_concrete_publishing_host_real_get_publishables (SpitPublishingPluginHost* base, int* result_length1) {
SpitPublishingConcretePublishingHost * self;
SpitPublishingPublishable** result = NULL;
- SpitPublishingPublishable** _tmp0_ = NULL;
- gint _tmp0__length1 = 0;
- SpitPublishingPublishable** _tmp1_ = NULL;
- gint _tmp1__length1 = 0;
- SpitPublishingPublishable** _tmp2_ = NULL;
- gint _tmp2__length1 = 0;
+ SpitPublishingPublishable** _tmp0_;
+ gint _tmp0__length1;
+ SpitPublishingPublishable** _tmp1_;
+ gint _tmp1__length1;
+ SpitPublishingPublishable** _tmp2_;
+ gint _tmp2__length1;
#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1114,20 +1108,20 @@ 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 1114 "PublishingPluginHost.c"
+#line 1108 "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 1120 "PublishingPluginHost.c"
+#line 1114 "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) {
#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 1127 "PublishingPluginHost.c"
+#line 1121 "PublishingPluginHost.c"
}
@@ -1135,14 +1129,14 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
SpitPublishingConcretePublishingHost * self;
SpitPublishingProgressCallback result = NULL;
PublishingUIProgressPane* progress_pane = NULL;
- PublishingUIPublishingDialog* _tmp0_ = NULL;
- SpitPublishingDialogPane* _tmp1_ = NULL;
+ PublishingUIPublishingDialog* _tmp0_;
+ SpitPublishingDialogPane* _tmp1_;
gint i = 0;
- SpitPublishingPublishable** _tmp2_ = NULL;
- gint _tmp2__length1 = 0;
- SpitPublishingProgressCallback _tmp25_ = NULL;
- void* _tmp25__target = NULL;
- GDestroyNotify _tmp25__target_destroy_notify = NULL;
+ SpitPublishingPublishable** _tmp2_;
+ gint _tmp2__length1;
+ SpitPublishingProgressCallback _tmp25_;
+ void* _tmp25__target;
+ GDestroyNotify _tmp25__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);
@@ -1162,7 +1156,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 1162 "PublishingPluginHost.c"
+#line 1156 "PublishingPluginHost.c"
{
SpitPublishingPublishable** publishable_collection = NULL;
gint publishable_collection_length1 = 0;
@@ -1174,51 +1168,51 @@ 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 1174 "PublishingPluginHost.c"
- SpitPublishingPublishable* _tmp3_ = NULL;
+#line 1168 "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 1181 "PublishingPluginHost.c"
+#line 1175 "PublishingPluginHost.c"
{
gboolean _tmp4_ = FALSE;
- gboolean _tmp5_ = FALSE;
+ gboolean _tmp5_;
gdouble phase_fraction_complete = 0.0;
- gint _tmp18_ = 0;
- SpitPublishingPublishable** _tmp19_ = NULL;
- gint _tmp19__length1 = 0;
+ gint _tmp18_;
+ SpitPublishingPublishable** _tmp19_;
+ gint _tmp19__length1;
gdouble fraction_complete = 0.0;
- gdouble _tmp20_ = 0.0;
- gdouble _tmp21_ = 0.0;
- PublishingUIProgressPane* _tmp22_ = NULL;
- gdouble _tmp23_ = 0.0;
- gint _tmp24_ = 0;
+ gdouble _tmp20_;
+ gdouble _tmp21_;
+ PublishingUIProgressPane* _tmp22_;
+ gdouble _tmp23_;
+ gint _tmp24_;
#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 1201 "PublishingPluginHost.c"
+#line 1195 "PublishingPluginHost.c"
} else {
- SpitPublishingPublisher* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+ 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 1211 "PublishingPluginHost.c"
+#line 1205 "PublishingPluginHost.c"
}
#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
if (_tmp4_) {
-#line 1215 "PublishingPluginHost.c"
- SpitPublishingProgressCallback _tmp8_ = NULL;
- void* _tmp8__target = NULL;
- GDestroyNotify _tmp8__target_destroy_notify = NULL;
+#line 1209 "PublishingPluginHost.c"
+ SpitPublishingProgressCallback _tmp8_;
+ void* _tmp8__target;
+ GDestroyNotify _tmp8__target_destroy_notify;
#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp8_ = NULL;
#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1237,17 +1231,17 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
_g_object_unref0 (progress_pane);
#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return result;
-#line 1237 "PublishingPluginHost.c"
+#line 1231 "PublishingPluginHost.c"
}
{
PublishingGlueMediaSourcePublishableWrapper* wrapper = NULL;
- SpitPublishingPublishable* _tmp9_ = NULL;
- PublishingGlueMediaSourcePublishableWrapper* _tmp10_ = NULL;
- PublishingGlueMediaSourcePublishableWrapper* _tmp11_ = NULL;
- gint _tmp12_ = 0;
- gboolean _tmp13_ = FALSE;
- GFile* _tmp14_ = NULL;
- GFile* _tmp15_ = NULL;
+ SpitPublishingPublishable* _tmp9_;
+ PublishingGlueMediaSourcePublishableWrapper* _tmp10_;
+ PublishingGlueMediaSourcePublishableWrapper* _tmp11_;
+ gint _tmp12_;
+ gboolean _tmp13_;
+ GFile* _tmp14_;
+ GFile* _tmp15_;
#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp9_ = publishable;
#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1272,7 +1266,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
_g_object_unref0 (wrapper);
#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1272 "PublishingPluginHost.c"
+#line 1266 "PublishingPluginHost.c"
goto __catch38_spit_publishing_publishing_error;
}
#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1287,20 +1281,20 @@ 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 1287 "PublishingPluginHost.c"
+#line 1281 "PublishingPluginHost.c"
}
#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (wrapper);
-#line 1291 "PublishingPluginHost.c"
+#line 1285 "PublishingPluginHost.c"
}
goto __finally38;
__catch38_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp16_ = NULL;
- SpitPublishingProgressCallback _tmp17_ = NULL;
- void* _tmp17__target = NULL;
- GDestroyNotify _tmp17__target_destroy_notify = NULL;
+ GError* _tmp16_;
+ SpitPublishingProgressCallback _tmp17_;
+ void* _tmp17__target;
+ GDestroyNotify _tmp17__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"
@@ -1329,7 +1323,7 @@ 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 1329 "PublishingPluginHost.c"
+#line 1323 "PublishingPluginHost.c"
}
__finally38:
#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1344,7 +1338,7 @@ 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 1344 "PublishingPluginHost.c"
+#line 1338 "PublishingPluginHost.c"
}
#line 221 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp18_ = i;
@@ -1377,7 +1371,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
i = _tmp24_ + 1;
#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (publishable);
-#line 1376 "PublishingPluginHost.c"
+#line 1370 "PublishingPluginHost.c"
}
}
}
@@ -1397,7 +1391,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
_g_object_unref0 (progress_pane);
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
return result;
-#line 1396 "PublishingPluginHost.c"
+#line 1390 "PublishingPluginHost.c"
}
@@ -1408,7 +1402,7 @@ static void spit_publishing_concrete_publishing_host_class_init (SpitPublishingC
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 1407 "PublishingPluginHost.c"
+#line 1401 "PublishingPluginHost.c"
}
@@ -1416,36 +1410,36 @@ static void spit_publishing_concrete_publishing_host_spit_publishing_plugin_host
#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"
- iface->install_dialog_pane = (void (*)(SpitPublishingPluginHost*, SpitPublishingDialogPane*, SpitPublishingPluginHostButtonMode)) spit_publishing_concrete_publishing_host_real_install_dialog_pane;
+ iface->install_dialog_pane = (void (*) (SpitPublishingPluginHost *, SpitPublishingDialogPane*, SpitPublishingPluginHostButtonMode)) spit_publishing_concrete_publishing_host_real_install_dialog_pane;
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- iface->post_error = (void (*)(SpitPublishingPluginHost*, GError*)) spit_publishing_concrete_publishing_host_real_post_error;
+ iface->post_error = (void (*) (SpitPublishingPluginHost *, GError*)) spit_publishing_concrete_publishing_host_real_post_error;
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- iface->stop_publishing = (void (*)(SpitPublishingPluginHost*)) spit_publishing_concrete_publishing_host_real_stop_publishing;
+ iface->stop_publishing = (void (*) (SpitPublishingPluginHost *)) spit_publishing_concrete_publishing_host_real_stop_publishing;
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- iface->get_publisher = (SpitPublishingPublisher* (*)(SpitPublishingPluginHost*)) spit_publishing_concrete_publishing_host_real_get_publisher;
+ iface->get_publisher = (SpitPublishingPublisher* (*) (SpitPublishingPluginHost *)) spit_publishing_concrete_publishing_host_real_get_publisher;
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- iface->install_static_message_pane = (void (*)(SpitPublishingPluginHost*, const gchar*, SpitPublishingPluginHostButtonMode)) spit_publishing_concrete_publishing_host_real_install_static_message_pane;
+ iface->install_static_message_pane = (void (*) (SpitPublishingPluginHost *, const gchar*, SpitPublishingPluginHostButtonMode)) spit_publishing_concrete_publishing_host_real_install_static_message_pane;
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- iface->install_pango_message_pane = (void (*)(SpitPublishingPluginHost*, const gchar*, SpitPublishingPluginHostButtonMode)) spit_publishing_concrete_publishing_host_real_install_pango_message_pane;
+ iface->install_pango_message_pane = (void (*) (SpitPublishingPluginHost *, const gchar*, SpitPublishingPluginHostButtonMode)) spit_publishing_concrete_publishing_host_real_install_pango_message_pane;
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- iface->install_success_pane = (void (*)(SpitPublishingPluginHost*)) spit_publishing_concrete_publishing_host_real_install_success_pane;
+ iface->install_success_pane = (void (*) (SpitPublishingPluginHost *)) spit_publishing_concrete_publishing_host_real_install_success_pane;
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- iface->install_account_fetch_wait_pane = (void (*)(SpitPublishingPluginHost*)) spit_publishing_concrete_publishing_host_real_install_account_fetch_wait_pane;
+ iface->install_account_fetch_wait_pane = (void (*) (SpitPublishingPluginHost *)) spit_publishing_concrete_publishing_host_real_install_account_fetch_wait_pane;
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- iface->install_login_wait_pane = (void (*)(SpitPublishingPluginHost*)) spit_publishing_concrete_publishing_host_real_install_login_wait_pane;
+ iface->install_login_wait_pane = (void (*) (SpitPublishingPluginHost *)) spit_publishing_concrete_publishing_host_real_install_login_wait_pane;
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- iface->install_welcome_pane = (void (*)(SpitPublishingPluginHost*, const gchar*, SpitPublishingLoginCallback, void*)) spit_publishing_concrete_publishing_host_real_install_welcome_pane;
+ iface->install_welcome_pane = (void (*) (SpitPublishingPluginHost *, const gchar*, SpitPublishingLoginCallback, void*)) spit_publishing_concrete_publishing_host_real_install_welcome_pane;
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- iface->set_service_locked = (void (*)(SpitPublishingPluginHost*, gboolean)) spit_publishing_concrete_publishing_host_real_set_service_locked;
+ iface->set_service_locked = (void (*) (SpitPublishingPluginHost *, gboolean)) spit_publishing_concrete_publishing_host_real_set_service_locked;
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- iface->set_dialog_default_widget = (void (*)(SpitPublishingPluginHost*, GtkWidget*)) spit_publishing_concrete_publishing_host_real_set_dialog_default_widget;
+ iface->set_dialog_default_widget = (void (*) (SpitPublishingPluginHost *, GtkWidget*)) spit_publishing_concrete_publishing_host_real_set_dialog_default_widget;
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- iface->get_publishable_media_type = (SpitPublishingPublisherMediaType (*)(SpitPublishingPluginHost*)) spit_publishing_concrete_publishing_host_real_get_publishable_media_type;
+ iface->get_publishable_media_type = (SpitPublishingPublisherMediaType (*) (SpitPublishingPluginHost *)) spit_publishing_concrete_publishing_host_real_get_publishable_media_type;
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- iface->get_publishables = (SpitPublishingPublishable** (*)(SpitPublishingPluginHost*, int*)) spit_publishing_concrete_publishing_host_real_get_publishables;
+ 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 1444 "PublishingPluginHost.c"
+ iface->serialize_publishables = (SpitPublishingProgressCallback (*) (SpitPublishingPluginHost *, gint, gboolean, void**, GDestroyNotify*)) spit_publishing_concrete_publishing_host_real_serialize_publishables;
+#line 1438 "PublishingPluginHost.c"
}
@@ -1464,15 +1458,17 @@ static void spit_publishing_concrete_publishing_host_instance_init (SpitPublishi
self->priv->_publishables_size_ = self->priv->publishables_length1;
#line 19 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self->priv->current_login_callback = NULL;
+#line 19 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
+ self->priv->current_login_callback_target = self;
#line 20 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
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 1467 "PublishingPluginHost.c"
+#line 1463 "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);
@@ -1482,7 +1478,7 @@ 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 1481 "PublishingPluginHost.c"
+#line 1477 "PublishingPluginHost.c"
}